Add package.json to list of files.
Merge branch 'master' into gh-pages