Merge branch 'master' of https://github.com/davidjoy/adbox
Merge commit 'eadd5ccc3e238e977908d3d844738ad1ce09701e'
Support overriding various Vagrant settings with a local settings file.
Merge pull request #4 from bostanio/settings_overrides

Support overriding various Vagrant settings with a local settings file.
Merge branch 'master' of https://github.com/davidjoy/adbox