Misc stuff: tidy up and auto selecting no-milk for espressos. Fixes #22