Re. Factor. Everything.
Merge branch 'master' into daniel
Hmmm
Ugh markdown
Merge pull request #12 from floatyduck/daniel

Merge in refactoring