Django 1.5 support
Merge branch 'master' of https://github.com/tomasbasham/vinternships

Conflicts:
	vinternships/vinternships/templates/listings.html
Style listings a bit