Added semantic highlighting
Fixed merge conflict
More changes to MOTD stuff. Also, changed the default TERM.