init
Merge branch 'master' of github.com:erjun/vimrc