diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4cab1f4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
diff --git a/.gitignore b/.gitignore
index 2226203..7259ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
+*.orig
 *.pyc
 .dotest
+.idea/