linting
Merge pull request #25 from rackerlabs/Linting

Lint