uniform comments (space+lowercase)
Merge branch 'master' into statusline

Conflicts:
	.vimrc