added test path to linter/styler and fixed problems
Merge pull request #35 from hey-you-project/code-cleanup

Self merging 'Added test path to linter/styler and fixed problems'. Just a few style fixes. All Travis tests pass.