use originals
vimrc commit shortcut
EasyAlign mapping
Merge branch 'master' of http://github.com/gmarik/vimfiles

Conflicts:
	vimrc