Fixed the weird lock file issue, should be good to go.
Merge branch 'wip/vivadohls' of github.com:Gordonei/ForwardFinancialFramework into wip/vivadohls