Merge pull request #47 from tfhartmann/master

Linting and Testing
Merge pull request #48 from tfhartmann/master

Whoops.. add tests back
Merge remote-tracking branch 'upstream/master'