Merge pull request #2 from jverkoey/master

Merging from upstream
Adding a comment and explicitly setting the class of something so that it doesn't look like "id".
Update NIAttributedLabel.m
Merge pull request #583 from LiyeZhang/master

Adding a comment to clarify what explicitLinkLocations in NIAttributedLabel actually is.