Aligned with master, ready for merge

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