upgrade configuration to version 2 (default in Vagrant 1.1+), correct indentation
Merge remote-tracking branch 'origin/rubyfication'