Add yasnippet support
Reorganize keybindings