Fix up tabbing, merge Kasey's rocket launcher
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/entities.js