unite
Merge branch 'master' of github.com:futaro/dotfiles

Conflicts:
	.vim/.vim.unite