Merge pull request #103 from jaunesarmiento/master

Update develop with changes to master
Adds back config/deploy.rb
Merge pull request #104 from jaunesarmiento/develop

Adds back config/deploy.rb