Fixed oversimplified regex for hashtags
Merge branch 'master' of https://github.com/ellenkoenig/twitter-party

fixed github merge conflict.