og_ui will always cause content type named 'group' to use admin theme on node/add form

Problem/Motivation

If "Use the administration theme when editing or creating content" is unchecked on the Appearance settings, it will be ignored for any content type with the machine name 'group'. The admin theme will still be used on node/add/group. This only happens when og_ui is enabled.

Steps to reproduce

1. Install a clean Drupal 7 with only og and og_ui enabled (you'll need Entity API).
2. Create a content type named "Group" (leave the default machine name of 'group'). Make it a group type.
3. Go to Appearance and uncheck "Use the administration theme when editing or creating content" at the bottom.
4. Navigate to node/add/group.

You should notice the admin theme is still in use, even though you've completed #3. Navigating to any other node/add form, you should see your default (non-admin) theme. You will even see the default theme on node/%/edit, where % is the nid of a Group node. Disabling og_ui will stop the bug from happening.

This is because in og_ui_admin_paths() of og_ui.module, 'node/*/group' is set as an admin path. This makes sense because in most cases the second argument ('*') is the nid of a group. In this situation, however, it is causing this bug.

Proposed resolution

Simply adding 'node/add/group' to $paths in og_ui_admin_paths() will not work because it will always force the default (non-admin) theme on this page, even if the theme option mentioned above is checked to true. The only way I see fixing this bug from within the module is by expanding the function to:

/**
 * Implements hook_admin_paths().
 */
function og_ui_admin_paths() {
  $paths = array(
    'node/*/group' => TRUE,
    'group/*/*/admin/*' => TRUE,
  );
  if (!variable_get('node_admin_theme')) {
    $paths['node/add/group'] = FALSE;
  }
  return $paths;
}

This does, however, involve an extra variable_get on any pages that aren't cached.

If the above (or a solution in general) does not make it into the module, others experiencing this problem can add this to a custom module:

/**
 * Implementation of hook_admin_paths().
 */
function custom_module_admin_paths() {
  $paths = array(
  	'node/add/group' => FALSE,
  );
  return $paths;
}

Note that this won't respect switching the node forms back to the admin theme (see above).