Merge branch 'refactoring' of github.com:koplyarov/vimstuff into refactoring
Making ^M line endings less visible
Merge branch 'refactoring'