Remove query string if it exists from controller.
Merge branch 'master' of github.com:kellyk/b3