because I don't want to use stash
Merge branch 'master' of github.com:pepijnkokke/FunFlow

Migrated 'subst' implementations to Measure/Flow.

Conflicts:
	src/FUN/Analyses.hs

Signed-off-by: Pepijn Kokke <pepijn.kokke@gmail.com>