Removed stargate controlmaster and fixed colorcolumn error
Merge branch 'master' of ssh://github.com/ghallsimpsons/Dotfiles