working upload to s3 and db save
Merge branch 'master' of github.com:jpstern/Phocal