Merge branch 'master' into marty
Made some other changes to fix crashing on gen estimate in summary page
Merge branch 'marty'
Merge branch 'master' of https://github.com/militantjones/estimator