Upgrade some vim bindings