changing things to use sudo if we're not logged in as root
Merge branch 'master' into django1.7