Merge vagrant 1.5 support to 'master'

According to Mitchell, the new Vagrant version has just been released