Some code cleanup, and also adds the ability to run on openshift.
Merge pull request #29 from qubyte/chore/cleanup

Some code cleanup, and also adds the ability to run on openshift.