misc cleanup
Merge branch 'master-up'

Conflicts:
	.jshintrc