correct scp command
Merge branch 'master' of https://github.com/calfater/easyrium-site

Conflicts:
	.travis.yml
Merge