Removed openshift marker files from repo
Pushed the openshift files into the Travis build
Merge branch 'develop'
Upgraded Chai