npm conventions
Merge pull request #6 from mcandre/master

npm conventions