Should make travis work now
Merge branch 'master' of https://github.com/FlowstoneTeam/FlowstoneEnergy