updated vimrc & zshrc for powerline
Merge branch 'master' of https://github.com/wakandan/dotfiles

Conflicts:
	.bashrc
	.vimrc
	.zshrc

modify .zshrc & .vimrc for install powerline