update setup.py to work with latest cx_freeze
add absolute paths to vim.exe and diff.exe
add support for merging config from backups