clean up
stuff in application controller
fixed merge conflicts in routes and session controller
Merge pull request #9 from rmoshier/rma_wed

Rma wed