Cleaning up for Open Shift
Merge branch 'master' of github.com:tylerjholmgren/sccnserver
combining my openshift git repo with my github repo