Merge pull request #62 from aselbie/master

(test) Start fresh with tests
(refactor) Lint told me to clean my shit up