Restored latest changes

Using this as another test that Travis + OpenShift still works