I believe that current approach to diversity is too focused on race\gender\orientation issues. I suspect that this rather brings more imbalance. To make things truly shine the scope must be widened. The first criterions which come to mind are general intelligence and skills. I strongly believe that the current sad state of Google search which everybody complains about can be easily attributed to their policy of hiring smart and skillful employees.