diff --git a/.gitattributes b/.gitattributes
index 66cbc79..64568fd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 **/*.rst -diff
+**/*.c -diff
+**/expat/**/*.c diff
diff --git a/MANIFEST.in b/MANIFEST.in
index d094a1a..8e68bf4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,8 @@
 include README.rst
 include CHANGES.rst
 
+# foo foobar
+
 include ez_setup.py
 include ah_bootstrap.py
 include setup.cfg
diff --git a/README.rst b/README.rst
index 10d8320..cd538aa 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
 =======
-Astropies are nice
+Astropies are very nice
 =======
 
 .. image:: https://pypip.in/v/astropy/badge.png
diff --git a/cextern/cfitsio/buffers.c b/cextern/cfitsio/buffers.c
index 8d80f46..fd5035d 100644
--- a/cextern/cfitsio/buffers.c
+++ b/cextern/cfitsio/buffers.c
@@ -5,6 +5,8 @@
 /*  Astrophysic Science Archive Research Center (HEASARC) at the NASA      */
 /*  Goddard Space Flight Center.                                           */
 
+// Foo foo
+
 #include <string.h>
 #include <stdlib.h>
 #include "fitsio2.h"
diff --git a/cextern/expat/.gitattributes b/cextern/expat/.gitattributes
index 1f24b48..927172f 100644
--- a/cextern/expat/.gitattributes
+++ b/cextern/expat/.gitattributes
@@ -1 +1,3 @@
 *.cmake diff=cmakediff
+/win32/*.txt -diff
+*.in -diff
diff --git a/cextern/expat/Makefile.in b/cextern/expat/Makefile.in
index 9c0f5d4..558732f 100644
--- a/cextern/expat/Makefile.in
+++ b/cextern/expat/Makefile.in
@@ -18,6 +18,8 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
 #
 
+# Bogus
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
diff --git a/cextern/expat/amiga/expat_68k.c b/cextern/expat/amiga/expat_68k.c
index aa4c6e2..aa42145 100644
--- a/cextern/expat/amiga/expat_68k.c
+++ b/cextern/expat/amiga/expat_68k.c
@@ -21,6 +21,8 @@
 ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+//  Foo test
+
 /*
 ** Note: This file was originally automatically generated by fdtrans.
 */
diff --git a/cextern/expat/expat_config.h.cmake b/cextern/expat/expat_config.h.cmake
index 25d79a6..3c3c0e6 100644
--- a/cextern/expat/expat_config.h.cmake
+++ b/cextern/expat/expat_config.h.cmake
@@ -1,4 +1,4 @@
-/* expat_config.h.in.  Generated from configure.in by autoheader.  */
+/* expat_config.h.in.  Generated from configure.in by autoheader.  Foo. */
 
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
 #cmakedefine BYTEORDER @BYTEORDER@
diff --git a/cextern/expat/win32/README.txt b/cextern/expat/win32/README.txt
index e3702ae..bcda8fc 100644
--- a/cextern/expat/win32/README.txt
+++ b/cextern/expat/win32/README.txt
@@ -1,3 +1,4 @@
+Gratuitous edit.
 
 Expat can be built on Windows in three ways: 
   using MS Visual C++ (6.0 or .NET), Borland C++ Builder 5 or Cygwin.
diff --git a/static/.gitattributes b/static/.gitattributes
new file mode 100644
index 0000000..5b282ed
--- /dev/null
+++ b/static/.gitattributes
@@ -0,0 +1 @@
+*.bmp -diff