Updated stuff
Merge branch 'master' of github.com:mateusduboli/configs

Conflicts:
	dotfiles/vim/scripts/vundles.vim
	dotfiles/zshrc
loglive and reorder source in zshrc