Lotta changes, see diff file
Made some changes to hot keys and defaults in vim.