Long overdue merge of outstanding bug fixes and new flow algorithm

We should have pulled this a long time ago... Includes fixes for a couple bugs and the new flowing algorithm.  A simulation of a year's worth of data can now be done in about 45 minutes on a Surface Pro.  If memory serves me correct, it can be done in about half an hour on my Surface pro in a linux VM.