Refactored probability calclations code, added water value calculations
Merge branch 'master' of github.com:margnus1/croc