Changes from Brian's review

[bwbush]

Here are the changes from my review. Unfortunately, they conflict with b3c332cc414a80c19f4b810e06b7e2a0cc15a05c and b3c332cc414a80c19f4b810e06b7e2a0cc15a05c.

When I made each commit in the list below, I used a text editor to only include the changes in the .mdl file that actually relate to what I changed: i.e., the extraneous changes from Vensim were excluded.

However, it looks like we're having the line-ending problem again so that Git flags every line as a change for my first commit (but not for the subsequent ones): d0a9dc4a5eb1939cf3a46189283d39c05fccb408 (the review version) has non-DOS line endings, but cdaa6b7912ba23a3ba10e8c4f6561ee2ba26c865 (my first commit) does have DOS line endings. Here is a list of the actual additions (not just the line-ending-related ones) in cdaa6b7912ba23a3ba10e8c4f6561ee2ba26c865:

$ diff --strip-trailing-cr orig next
1609a1610,1616
>       ~               |
> 
> BS imbalance=
>       ABS(BS balance)
>       /
>       (ABS(BS assets) + ABS(BS equity) + ABS(BS liabilities) + 1e-05)
>       ~       Dmnl
5162a5170,5174
> 10,109,BS imbalance,1231,517,44,11,8,3,0,0,0,0,0,0
> 1,110,49,109,1,0,0,0,0,64,0,-1--1--1,,1|(1233,363)|
> 1,111,51,109,1,0,0,0,0,64,0,-1--1--1,,1|(1255,516)|
> 1,112,50,109,1,0,0,0,0,64,0,-1--1--1,,1|(1205,545)|
> 1,113,48,109,1,0,0,0,0,64,0,-1--1--1,,1|(1208,621)|

Anyway, @rjhanes, please let me know how I can help resolve this mess. The individual commits below are a clear record of the series of changes I made, so it won't be much work to redo these.

[rjhanes]

eb6fd28 restores the increments and should solve the functionality conflict with b3c332c

[rjhanes]

All changes were merged manually.