Adds vim fugitive and defaults git to vimdiff
Adds conflict resolution cmds
Merge branch 'master' into monits

* master:
  Add rulers and fixed duplication
  Add silver searcher to vim
  Disable syntastic auto window
  Adds nerdtree to vim
  Keep installing files

Conflicts:
	.gitmodules
Update module urls to use https