Aligned with master, ready for pull

updated codebase, ready for resubmission for pull 

https://github.com/loopj/capistrano-node-deploy/pull/21#issuecomment-32569982