Add localvimrc
Add vim-virtualenv
Merge branch 'master' of github.com:cscorley/dotfiles

Conflicts:
	dots/.vimrc
Update subrepos