git vimdiff and more dos newline fixing
Merge branch 'master' of https://github.com/joedrago/env