Improve vim keybindings, renamed irssi theme
Merged from work