Code cleanup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/terminal.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/index.html
	web/init.js
	web/main.css