Merge pull request #5 from ares/master

Foreman 1.5 rebase
missed a sudo for a foreman-rake task
Merge pull request #6 from ares/master

More 1.5 related changes
Merge pull request #7 from ares/master

Last fixes for 1.5 rebase
Staypuft 0.0.6 support