Minor bug fixes
Merge branch 'master' of github.com:Gordonei/ForwardFinancialFramework
Merge branch 'master' of github.com:Gordonei/ForwardFinancialFramework
OK, this looks like a fix for the recent problems...