shrinkwrap fix
Add step that creates shrinkwrap compatible with earlier npm's
Tidied shrinkwrap json
Restore Makefile and shrinkwrap to code compatible with npm that comes with 0.8.4
deploy to production - version bump to 0.0.16
Merge branch 'master' into production

Conflicts:
	npm-shrinkwrap.json