Indentation fix
Merge branch 'master' of github.com:Gordonei/ForwardFinancialFramework

Conflicts:
	Underlyings/Underlying.py
Fixing Barrier Option behaviour
More work on moving away from having to change directories inside code generation