diff --git a/.gitattributes b/.gitattributes
index 412eeda78..0b6acf184 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,13 +10,13 @@
 *.dbproj merge=union
 
 # Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc  diff=astextplain
+*.DOC  diff=astextplain
 *.docx diff=astextplain
 *.DOCX diff=astextplain
 *.dot  diff=astextplain
 *.DOT  diff=astextplain
 *.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF  diff=astextplain
+*.rtf  diff=astextplain
+*.RTF  diff=astextplain
diff --git a/.gitignore b/.gitignore
index b9d6bd92f..989d13bf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,6 +165,23 @@ UpgradeLog*.htm
 App_Data/*.mdf
 App_Data/*.ldf
 
+
+#############
+## Qt Creator
+#############
+
+*.save
+*.autosave
+
+#############
+## GNU Emacs
+#############
+
+\#*
+.\#*
+*.elc
+
+
 #############
 ## Windows detritus
 #############
@@ -179,10 +196,21 @@ Desktop.ini
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Mac crap
+
+#############
+## OS X
+#############
+
 .DS_Store
 
 
+#############
+## C#
+#############
+
+*.resources
+
+
 #############
 ## Python
 #############
@@ -208,8 +236,8 @@ pip-log.txt
 .coverage
 .tox
 
-#Translations
+# Translations
 *.mo
 
-#Mr Developer
+# Mr Developer
 .mr.developer.cfg