Use the new build env on Travis

more ram and cpu, improved network and boot times

http://docs.travis-ci.com/user/workers/container-based-infrastructure/

more docs coming soon
Merge pull request #36 from joshk/patch-1

Use the new build env on Travis
Merge branch 'master' into 2.0

Conflicts:
	.travis.yml