Cosmetic changes; added ctags; remapped some keybindings