Merge remote branch 'jarrod/master'

Conflicts:
	README.rst

Author: mih

.gitignore

@@ -1,7 +1,73 @@
+# Editor temporary/working/backup files #
+#########################################
+.#*
+[#]*#
+*~
+*$
+*.bak
+*.diff
+*.org
+.project
+*.rej
+.settings/
+.*.sw[nop]
+.sw[nop]
+*.tmp
+
+# Not sure what the next two are for
 *.kpf
 *-stamp
-build
-*.swp
-*.pyc
-*.pyo
+
+# Compiled source #
+###################
+*.a
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.py[oc]
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.bz2
+*.bzip2
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.tbz2
+*.tgz
+*.zip
+
+# Python files #
+################
+build            # setup.py working directory
+_build           # sphinx build directory
+./dist           # setup.py dist directory
+./*.egg-info     # Egg metadata
+./.shelf         # The shelf plugin uses this dir
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.gdb_history
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Things specific to this project #
+###################################
 nibabel.egg-info/

COPYING

@@ -1,5 +1,7 @@
 .. -*- mode: rst; fill-column: 78 -*-
 .. ex: set sts=4 ts=4 sw=4 et tw=79:
+.. vim:syntax=rest
+
 
 .. _license:
 

Changelog

@@ -1,4 +1,5 @@
 .. -*- mode: rst -*-
+.. vim:syntax=rest
 
 .. _changelog:
 

README.txt

@@ -1,3 +1,7 @@
+.. -*- rest -*-
+.. vim:syntax=rest
+
+
 =======
 NiBabel
 =======

TODO

@@ -1,3 +1,6 @@
+.. -*- rest -*-
+.. vim:syntax=rest
+
 Stephan's TODO
 --------------