Merge branch 'master' of ssh://github.com/cantino/huginn into openshift

Conflicts:
	config/database.yml
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
Merge branch 'openshift' of ssh://github.com/ghelleks/huginn into openshift