Minor modification
Merge branch 'master' of https://github.com/jleivaizq/dotfiles

Conflicts:
	zsh/zshrc.symlink
Some vim fixes:
- Re-link to python-mode
- Link to riv (RST documentation)
- Use vim-bbye to avoid split closing
- Fix snipmate and adds some snipets