* Turn on "Show Included Features at Top Level" filter by default
 * Sort consistently in standard/inverted hierarchy modes
 * No longer sort features with child features ahead of other features

Change-Id: Icd76ad6adac37fbb3afb106477fd8aeec8d832cb
Signed-off-by: Ed Scadding <edscadding@secondfiddle.org.uk>