Merge pull request #34 from thewillhuang/simon4

Fixed user routes and tests
update controllers
pushing some scope stuff