changes from duda session
removed user list controller spec
Merge pull request #319 from chelseakomlo/master

Fixed up tests failing due to path issues