.openshift directory
openshift setup is working
Merge remote-tracking branch 'origin/master' into openshift2

Conflicts:
	bin/setup_heroku
fix spec
do not depend on .env.example any more
Merge branch 'master' into openshift2

Conflicts:
	bin/setup_heroku
fix heroku
clarify openshift
Merge pull request #566 from cantino/openshift2

OpenShift deployment