Removed some duplicate mappings
Added a mapping for starting a global search and replace
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc