Changed default checked out branches to be correct-ish (although we do not strictly speaking follow OWRT AA branch right now, but perhaps I should sync up again).