bumped vim to 7.3.1087
Merge branch 'testing'