more jshint cleanup
more lint work
Merge branch 'master' into npm

Conflicts:
	cfs/parcel.js
	db.js
	view.js