vimrc and gitgutter

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
stupid merge conflict

Signed-off-by: Alexander Skjolden <alex@plastboks.net>