install codic-vim
use virtualenvs pip only;
update iterm2
Merge branch 'master' of github.com:hachibeeDI/dotfiles

Conflicts:
	.vimrc