clean up vimrc

Conflicts:
	.vimrc
Set find path
Add push-line binding.
wallpaper
Merge branch 'master' into x201