Merge branch 'manaburn_baby' into 'master'

Manaburn, baby

Ask and ye have received this highly complex and carefully-crafted change.
(Honestly, we need more cleanups like that. We need to be able to make small libraries to import from whenver and use in talents/egos/etc. Is it doable?)