Added vundle upgrade
zsh aliases
Merge remote-tracking branch 'origin/master'
Added diff folding file