change the removal link text based on who's looking at it
collaborators are removed properly again
Merge pull request #358 from opscode/more-maintainer-fixes

More maintainer fixes