Merge pull request #186 from trontrytel/master

pull me
splitting icicle.cpp into several files
moving panic stuff into a separate file
wip on blk_2m cond_evap works