Added STATIC_ROOT
Merged manually
Merge branch 'master' of https://github.com/totalorder/headshot
Merge branch 'master' of https://github.com/totalorder/headshot
Merge branch 'master' of https://github.com/totalorder/headshot