Update to Vagrant 1.5 & Ubuntu 13.10
Merge branch 'master' into v1.2.0