fixing emoticon greedy regex; fixing _ in urls
Merge pull request #16 from JoshHarris/master

Josh H: Adding initial support for twitter statuses