updating makefile dependencies
Merge branch 'turbulence' of github.com:FluidityProject/fluidity into turbulence