Clean up menu code

We aren't at all consistent with calling super or returning the correct
value in the options methods e.g. onOptionsItemSelected. This makes it
consistent with the examples in the Android docs.