Merge pull request #21 from DaveWoodCom/feature/dw-username-hashtag-convenience

Add convenience category functions to add @ to users names and # to hash...
Merge remote-tracking branch 'upstream/master' into develop