Upgrade Vagrantfile for 1.1+
Merge branch 'master' of github.com:colemanm/terra