tried to fix vimperatorrc...
Merge branch 'master' of https://github.com/timdonegan/dotfiles
fixed merge conflict