Cleaning up geard vs openshift 3 naming
Merge pull request #135 from danmcp/master

Cleaning up geard vs openshift 3 naming