Added display of EOL chars, whitespaces and Tabs
Merge branch 'master' of https://github.com/yeganer/dotfiles

Conflicts:
	vim/startup/settings.vim

Did the same change 2 times and named it differently
Corrected that