Add --ioapic to Vagrantfile
Merge remote-tracking branch 'upstream/master'