Fix problems with merging vim.Dictionary

Also add tests

Fixes #516
Disable vim.bindeval support for vim_getwar for old vim versions
Remove uneeded code
Fix tests
Merge remote-tracking branch 'zyx-i/fix-516' into develop