Merge branch 'master' into upload-mongod

Conflicts:
	environs/tools/export_test.go
Tweak bootstrap to not always upload tokumx.

This is now only done when an ENV var is set.
switch to using mongo downloaded from s3 instead of uploading
Merge master to try and get things up to date