updated vimrc with the jj hack.
merge branch 'master' of github.com:brendan/dotfiles