Fix trailing whitespace
Merge pull request #135 from spring-peepers-2014/restructure-controllers

Fix trailing whitespace