Adding .vagrant-openshift.json for more advanced options
Merge pull request #321 from danmcp/master

Merged by openshift-bot