much
Merge branch 'master' of github.com:suitougreentea/dotfiles

Conflicts:
	.vimrc
change keybind
uninstall oh-my-zsh, install powerline-shell