merge unix dos formats
Merge branch 'master' of https://github.com/primitivorm/vimfiles

Conflicts:
	_vimrc
add support for unix