Make feature branches use master as their parent.

Also use a nicer formatting for multiline aliases.