* various updates
Merge branch 'master' of https://github.com/jamez1/vvengine

Conflicts:
	node_modules/ejs/package.json