Upgraded to 1.7.0
Upgraded to 5.3.1. Removed some conflicts with vim-vim-support.