Ensure Vagrant can properly merge multiple configurations
Merge pull request #25 from emyl/fix-config

Ensure Vagrant can properly merge multiple configurations