Various updates, including colours on terminal and electric-pair-mode
Merge branch 'master' of https://github.com/rogeraird/Emacs-Config