Better TERM, hub alias git, no git merge backups