ensure localhost is in hosts
Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'