Issue #1099 Documentation cleanup

Fixed all but one duplicate label warning
Merge pull request #1111 from mozilla-services/issue_1099

Issue #1099 Documentation cleanup