Merge branch 'master' of github.com:kwmur/dotfiles

Conflicts:
	.vim/bundle/neocomplcache
	.vim/bundle/neosnippet
	.vim/bundle/unite.vim
	.vim/bundle/zencoding-vim
Merge branch 'master' of github.com:kwmur/dotfiles

Conflicts:
	.vim/bundle/zencoding-vim
Merge branch 'master' of github.com:kwmur/dotfiles
Merge branch 'master' of github.com:kwmur/dotfiles