update package.json
Merge branch 'master' into glslify

Conflicts:
	package.json
pull z layering scale factor into an external constant
directional light doesn't need vertex position
split height-based lighting boost into its own function
commented out point rendering for testing
add shader modules to makefile dependencies
move tile view & world transforms into matrix uniforms (using gl-matrix)
comment out some currently unused uniforms