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
fix travis.yml post merge
travis: opam config env
Tweak installation instructions
travis: try a deployment push
travis; rebase then add
travis: Set git variables for commit
Travis: Add in the production IP address settings, and copy those into deployment repo too
Merge branch 'master' of github.com:mirage/mirage-www
travis: record if its a pull request or not (we dont want to update live site on a pull req)
travis: remove old binary if one exists
travis: secure variables arent set in a pull request
travis: record latest changeset
Fix switch instructions
Merge pull request #37 from samoht/master

Fix switch instructions
use `which mirari` to workaround the sudo, suggested by @jonludlam
add amir to people