Update vimrc
Merge branch 'master' of github.com:patrickrbc/dotfiles
Add stylus and conque