Merge pull request #1 from mapimopi/master

A few bug fixes
Update dropbox.yml
Merge branch 'master' of heroku.com:kapandaria