Merge pull request #155 from danmcp/master

Make Openshift v3 easier to follow
Merge pull request #156 from danmcp/master

Make naming with v2 and v3 consistent
Merge pull request #157 from danmcp/master

Remove v3 logic from Vagrantfile
Bumping version