updated static files to work with s3 and locally
removed extraneous settings, fixed requirements
Merge pull request #342 from kaitlin/master

updated static assets to work with S3