commit npm updates
Merge branch 'master' of https://github.com/ibolton/boltland

Conflicts:
	package.json
remove