add local antigen
Merge remote-tracking branch 'upstream/master'
Adding my local vimrc
Removing local vimrc
Merge remote-tracking branch 'upstream/master'
hlsearch turned on
Merge pull request #12 from cdpalmer/feature/hlsearch

Feature/hlsearch