Tidy up
Merge branch 'master' of https://github.com/tmcinerney/dotfiles
Updated editor