Avoid masking Capistrano config options
Merge pull request #348 from johnnyshields/default-opts

Avoid masking Capistrano config options