Merge pull request #126 from Sudyx/master

Transfigure state fix
Improved mysterious caped fellow's text output
Merge remote-tracking branch 'upstream/master'
Changes to daily prophet note output
Fixed lamp salesman AGAIN
Fixes to incendio and flippendo
More prom fixes
Merge pull request #127 from Rotem12/master

Fixes
Merge remote-tracking branch 'upstream/master'