Merge pull request #65 from sorenh/master

Install modules in /usr/share rather than /etc
Merge pull request #66 from sorenh/lxc

Use fgrehm/trusty64-lxc when using the LXC provider
Use environment file to populate Vagrant config
Don't try to install Puppet every single time.
Don't hardcode IP for proxy. Rely on environment.
Ensure etcd discovery token is set

Bail out if it's not already set in the VM and not available in the
environment. If it'se available in the environment inject it into the
VM.

Provide newtokens.sh to fetch new tokens.
Run puppet more like userdata

...and make maybe-upgrade.sh work, too.
Sync lib and site.pp
Stop running tests from Vagrantfile
Merge pull request #69 from sorenh/vagrantfile

A bunch of Vagrantfile improvements
Make environment confiugurable in vagrant

allow users to set env as an env var to change
what cloud file and env are used for deployment.
Merge pull request #72 from bodepd/vagrantfile_fixes

Vagrantfile fixes
Add separate vagrant env for lxc due to network differences