WIP: functions for provision script and more proper restart
Merge commit 'e81532b' into vagrant-ubuntu-1304-raring64
Merge commit '773fe5e' from raring