Fix trailing comma in package.json that was making npm install fail.
Merge pull request #231 from aaronr/fix_package_json

Fix trailing comma in package.json that was making npm install fail.
Merge remote-tracking branch 'upstream/master'