Skinnify the controllers a bit.
Merge branch 'fat-skinny-refactor'
Merge branch 'master' of github.com:cpursley/Lucidly