Turn off the rename for semicolon to colon - my fingers can't learn it
Merge branch 'master' of github.com:michaelpnash/vi-for-scala

Conflicts:
	.vimrc