uwsgi static-map references removed from docs
merge
Merge branch 'master' of github.com:20tab/twentytab-customadmin

Conflicts:
	README.md
django 1.7 supported