Update npm-shrinkwrap to include grunt-asset-monitor
Fix merge conflicts