Finished Up NPM v1.1 changes