Merge branch 'master' of http://github.com/tenach/scrib
Pubsyms for help, yay
fixing stupid things
Merge branch 'master' of git://github.com/KittyTristy/scrib into KittyTristy-maser