Add support for retrieving a deployment key for mirage/mirage-www-deployment
Merge branch 'travis-senv'

Conflicts:
	.travis-ci.sh
	.travis.yml
resolve more merge conflicts
whitespace