Diversity and inclusion have become hot-button issues in the past couple years. But there’s still a way to go until we get it completely right.