Style cleanups in application_controller
Merge pull request #807 from martinpovolny/app_cont_cleanups

Style cleanups in application_controller