Clean up.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src-terminal/com/jediterm/terminal/ui/TerminalPanel.java
Fixed the incorrect merge.