Merge remote-tracking branch 'jstewmon/issue-463'

Conflicts:
	MANIFEST.in

MANIFEST.in

@@ -5,8 +5,8 @@ include README.rst
 include TODO.txt
 include tox.ini
 include supervisor/version.txt
-include supervisor/skel/*.conf
-include supervisor/tests/fixtures/*.conf
-recursive-include supervisor/ui *.html *.css *.png
+include supervisor/skel *.conf
+include supervisor/tests/fixtures *.conf
+recursive-include supervisor/ui *.html *.css *.png *.gif
 recursive-include docs *.rst *.css *.gif *.png
 recursive-exclude docs/.build *