Weaken some simplification rules due to horrible compile times.
Merge branch 'master' of github.com:halide/Halide

Conflicts:
	src/Simplify.cpp