Removed openshift stuff, added bootstrap and made some other changes