Some general cleanup and added vagrant-cachier plugin to speed up provisioning