Show trailing spaces
Merge branch 'master' of github.com:vasilakisfil/config.rc

Conflicts:
	.vimrc
disable visual flickering when escaping