Switch to side-by-side view

--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *-py2.6.egg
 *.log
 *.pyc
+*.orig
 */.coverage
 *~
 *.swp