Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-lts-precise64
include name in test vm
merge with raring
WIP: functions for provision script and more proper restart
Merge commit 'e81532b' into vagrant-ubuntu-1304-raring64