Merge commit '6d011'

Conflicts:
	.vimrc
	scripts/monitrc