Merge pull request #3720 from comma/master

Couple o fixes
Reverted both LordBraindead and my own work on firecode back to when it was stable.  Fixed some issue with phantom-fires-in-pipes.  Removed some useless things left over from FEA.
Merge pull request #3726 from SkyMarshal/firefixes

Reverted both LordBraindead and my own work on firecode back to when it was stable.