Fold and diff related tweaks, window display behaviour tweaks
Merge branch 'master' of github.com:qstrahl/.vim

Conflicts:
	vimrc