Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'
Avoid mounting /guest/guest loop
Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'

Conflicts:
	vagrant/provision_script.sh
Merge remote-tracking branch 'origin/master' into vagrant-debian-7-wheezy64