add mail abbreviations
add comment box abbreviation.
Merge branch 'master' of https://github.com/sinarf/dotvim

Conflicts:
	vimrc