Merge updates from master into 'mavericks' branch
Add Vagrantfile

so manually testing changes to recipes is easier