Misc changes
Misc updates
Merge commit 'c0a8'

* commit 'c0a8':
  Misc updates
  Minor fixes

Conflicts:
	.vimrc