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