(refactor) transfers logic to directives and factories, cleans up controller
Merge pull request #34 from TessMyers/develop

(refactor) transfers logic to directives and factories, cleans up contro...