Master ... release

After rc/johnnycake has been merged in, updating master to bring in new Vagrantfiles.