Remove z
Add setting for unite
Add screen lock shortcut
use uim
Add nerdtree for vimrc
Merge branch 'master' of ssh://github.com/kunitoo/dotfiles

Conflicts:
	dot.vimrc
Remove xsession