+ Added lxc provider
Merge branch 'master' of github.com:eddyxu/vagrant-boxes

Conflicts:
	buildbot/Vagrantfile