Merge pull request #266 from cushon/master

Fix lint.
Add CONTRIBUTING file