Updated the site to use the new gem
Updated the deployment method for s3
Merge branch 'master' of github.com:rsoden/epic