Merge pull request #479 from justjake/jake/some-small-issues

Modularize eslintrc, add tests