Move terminal support into new package

Numerous other updates
Merge branch 'master' of github.com:jonEbird/dotfiles