Moving OpenShift support to its own branch per #110
Moving OpenShift support to its own branch per #110
Merge branch 'master' of github.com:ghelleks/huginn

Conflicts:
	.env.example.openshift
	.openshift/action_hooks/post_deploy
	.openshift/action_hooks/post_start_ruby-1.9
	config/initializers/secret_token.rb
Merge branch 'master' of https://github.com/ghelleks/huginn into openshift

Conflicts:
	Gemfile
	Gemfile.lock