Linting
Merge pull request #129 from rvagg/linting

Linting