Add S3 local to remote move (spec is missing)
Merge branch 'master' of github.com:servebox/electric_sheep

Conflicts:
	acceptance/Sheepfile
	lib/electric_sheep/transports/scp.rb
	spec/electric_sheep/transports/scp_spec.rb