Remove weird unneeded crap
Merge branch 'master' into subdomains

* master:
  Remove weird unneeded crap

Conflicts:
	config/routes.rb