大修，很多改变-130327
whatot
Merge branch 'master' of https://github.com/whatot/whatot-vimrc

Conflicts:
	.vimrc