ensure .env.openshift exists before we source it
Merge branch 'master' of github.com:ghelleks/huginn

Conflicts:
	.openshift/action_hooks/pre_build
	.openshift/action_hooks/pre_start_ruby-1.9
no longer need  to load .env in pre_build