Merged the User model into the Account model and fixed users controller and users tests to use the Account model
Move users top-level routes to accounts route, update tests and apiJSONChai
Merge pull request #1 from mmerkes/user_to_account

Merge user routes with accounts