Upgrade Vagrant to 1.6.5
Upgrade RSpec to 3.1
Merge branch 'tests'