django 1.7 compat
fix env
test note, pypi badge
Merge pull request #1 from sheppard/master

Sync sources