Linted
Merge pull request #184 from rvagg/lint

Linted