took out pycs, changed settings to look for static files depending on if in dev
Merge branch 'master' of https://github.com/wtachau/tachaubennett
commit for testing prod script
fix merge conflict