Merge branch 'master' of github.com:jonmadison/node-api-template