Merge branch 'master' into bluebox-production-com
Merge branch 'bluebox-production-org' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Merge branch 'staging' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Merge branch 'master' into bluebox-production-com
Bump travis-build.
Update travis-build.

Shuts up outputting the command to switch DNS.
Bump travis-build.

Includes making the DNS server changes optional.
Merge branch 'staging' into bluebox-production-com
Merge branch 'master' into bluebox-production-org

Conflicts:
	Gemfile.lock
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
Merge branch 'master' into bluebox-production-org
update build