documented multiple environment config
documented multiple environment config
Merge branch 'features/environments_readme' of github.com:derek-watson/middleman-deploy into features/environments_readme

Conflicts:
	README.md
rmeoved conflicts
refined language
whitespace
Merge pull request #55 from derek-watson/features/environments_readme

Multiple Environments readme
Merge pull request #52 from whitetrefoil/master

Why not let the port of SFTP configurable?
Ensure `-e ssh ...` is always passed to rsync. Fixes #54
bump
add port reader for ftp method
Merge pull request #56 from xinminlabs/master

add port reader for ftp method
bump
Upload all files as binary to prevent corrupt images
Merge pull request #57 from crtvhd/master

Use binary transfer mode for all files to prevent corrupt images when deploying via FTP
bump
Update rsync.rb
Merge pull request #59 from andlum/replacing-run-with-exec-in-rsync

No method 'run' in rsync.rb
bump
Tiny change to README to suggest using 'system' over 'exec'

Reason being, 'exec' will run the shell command and then exit the ruby
process. While 'system will run the shell command and then continue
execution.

I feel this is a better example as the first thing I did was write a
rake task that chains multiple tasks together and the way 'exec' was
ending the process cost me a bit of time trouble shooting why.