add a limit to the ruby apps to add
overwrite configuration with env variables if present
test
Merge branch 'master' into heroku

* master:
  test
  overwrite configuration with env variables if present
  add a limit to the ruby apps to add

Conflicts:
	app/controllers/ruby_applications_controller.rb