Missed an emote.. derp.
Merge branch 'master' of https://github.com/scoundrels/scrib into working
Various fixes for things I missed, please no more
Merge pull request #139 from KittyTristy/working

Seriously, I'm done with this now.