Fixes colorcolumn, adds shortcut for Marked2
Merge branch 'master' of github.com:jeremykendall/vim