properly disallow gifs
meh
formidable doesn't work
meh
swiftleberry to connectington
some issues
jshint stuff
progress
asdf
more fixes
oops
asdf
gah
Merge branch 'master' of ../discore

Conflicts:
	routes/redirects.js
Merge branch 'master' of ../discore
tests pass