tidy dir
add plugin
Merge branch 'master' of github.com:daoyuan/vimrc

Conflicts:
	rc/.vimrc
add plugins