mime type stuff on uploader
install some gems
Merge branch 'master' of github.com:tsargent/horizon
Merge branch 'master' of github.com:tsargent/horizon
Merge branch 'staging'
commit