diff --git a/vimrc b/vimrc
index 6d72cd9..c7178e1 100644
--- a/vimrc
+++ b/vimrc
@@ -17,6 +17,7 @@ set history=1000
 set clipboard+=unnamed  " turns out I do like is sharing windows clipboard
 set autoread        " Set to auto read when a file is changed from the outside
 set autochdir       " Change current directory to be directory of current file
+set colorcolumn=80
 
 set backspace=start,eol,indent
 set whichwrap+=<,>,[,]
@@ -159,3 +160,7 @@ augroup coffee
     au! BufRead,BufNewFile *.coffee set filetype=coffee
 augroup END
 
+augroup COMMIT_EDITMSG
+    au! BufRead,BufNewFile COMMIT_EDITMSG set filetype=gitcommit
+augroup END
+