Merge occured diversion.
Merge branch 'master' of http://github.com/dariomanesku/.vim