De dupe all the organisation roles

It's a bug fix, but I wan't folk to check that where I'm doing the de-dupe is ok, also because I've fixed more than just the error reported in the bug.

For: https://www.pivotaltracker.com/story/show/45252461