Rename term to shell and fix #8.
Support "+alias" and "alias+" Fix #6.
Code cleanup.