Small cleanups
Setup options and keymaps in functions to avoid global variables
Merge remote-tracking branch upstream