Updated vimrc
Merge branch 'master' of github.com:brendan/brendan.conf