Moving back to OpenShift after experimenting with Heroku
Merge branch 'master' of https://github.com/kelvinn/alerted-us-aggregator

Conflicts:
	myflaskapp.py