Code review 7/10 - do not merge

- controllers need to be refactored big time
- javascript code organization is unclear
- model specs are almost blank -- need to get test coverage where it needs to be