Removing geard and adding openshift 3 options
Merge pull request #138 from danmcp/master

Removing geard and adding openshift 3 options