make local.sh do the right thing
bridge should be default route

otherwise the guests don't do what you think they will
Merge branch 'master' of github.com:sdague/devstack-vagrant

Conflicts:
	puppet/modules/devstack/files/local.sh