update 2014-10-31 morning
Merge branch 'master' of https://github.com/liuyang1/dotfiles

Conflicts:
	morevim/color.vim
Merge branch 'master' of https://github.com/liuyang1/dotfiles