Stashing incremental changes in case my ancient computer's inevitable failure is scheduled for today
Update routing to Rails 3.2

Signed-off-by: Florian Meier <florian.meier@koalo.de>