added s3 plugin
changes for heroku
Merge branch 'wordpress' of https://github.com/woliver/crosbie-web into wordpress