deleted
Merge branch 'master' of github.com:oliveagle/ole_etc

Conflicts:
	ole_vimrc
deleted