search vim opts, fix xsession
Merge branch 'master' of github.com:edgemaster/.configs

Conflicts:
	xsession