Remove copy local id_rsa.pub to remote host
Merge branch 'master' of https://github.com/alex8866/deploy

Conflicts:
	testenv.ini