100% compatibility with menu() and menu_vec()
Leave KEY_LEFT unused for now
Replace menu and menu_vec with calls to uimenu equivalents
Merge remote branch 'origin/master' into better_menu
Advanced inventory: Add [c]ategory sort
game.h: Remove #include "ui.h" as it piggybacks output.h
ui.* now conforms to cataclysmic indentation and spacing convention
Stop olfactory mask from removing scent

Fixes #1512
Merge PR #1524 - olfactory mask is no longer a scent sink
Merge PR #1518 - coalesce some UI code
Merge PR #1522 - category sorting in advanced inventory