rsync options for verbosity, increased buffer size
verbosity for npm, too
Merge branch 'master' of https://github.com/bevacqua/grunt-ec2

Conflicts:
	README.markdown
	tasks/lib/conf.js
Fixed merge conflict