Initial changes
Modernize
pin django version (1.5.1)
It should just work
Merge remote-tracking branch 'github/master'

Conflicts:
	README.md
	reqs/common.txt
README isnt templated (worry about that later