Add some shortcuts
Switched theme + vi-mode
Merge branch 'master' of github.com:hkupty/dotfiles

Conflicts:
	.zshrc
	oh-my-zsh
Suckit