Replace GREP_OPTIONS by alias
Add vim rule for python
Merge branch 'master' of https://github.com/vinc/dotfiles

Conflicts:
	_zsh/aliases.zsh