Misc changes

Changed conflciting keymaps, removed a command, moved snippets, added
file extensions