Django-ify'd all the things!
Merge branch 'master' of https://github.com/camerongray1515/ilwhack2014

Conflicts:
	resources/js/filtered.js