turned "no-trailing-spaces" on since the npm test checks the tests for that, and if the rule is on I can catch mistakes with a text editor plugin
Merge branch 'master' of https://github.com/brandyn1bennett/eslint