Lint the heck out of everything
Merge pull request #29 from StickmanVentures/lint

Lint the heck out of everything