Merge remote-tracking branch 'upstream/master' from kevinlawler/NSDate-TimeAgo