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

Conflicts:
	db.js
	view.js