Making the definition of pi conditional on it not existing
Support for OSX
Merge branch 'master' of https://github.com/Gordonei/ForwardFinancialFramework