Cleanup to correct some merge problems

Re-added lib/accessControl.js, disabled HMAC in configuration, and deleted npm-shrinkwrap.json.