diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..9369413a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*/*.py.example linguist-language=Python
diff --git a/alliance_auth/.gitignore b/alliance_auth/.gitignore
new file mode 100644
index 00000000..7c24c40c
--- /dev/null
+++ b/alliance_auth/.gitignore
@@ -0,0 +1,2 @@
+/settings.py
+!/*.example
diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index 5719ba82..dda3f3bc 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -1,4 +1,5 @@
 """
+vim: set filetype=python:
 Django settings for alliance_auth project.
 
 For more information on this file, see
@@ -6,6 +7,7 @@ https://docs.djangoproject.com/en/1.6/topics/settings/
 
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.6/ref/settings/
+
 """
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)