Heaps of cleanup based on lint, including removal of several files that are now unused.
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
Resolved some merge conflicts.