Improving the matching a bit
Merge branch 'master' of https://github.com/brycebaril/meatspace-chat-v2 into brycebaril-master
Merge branch 'brycebaril-master'