Merge pull request #294 from fcr/master

Made Python local laplacian track the C++ version.
Fix horrifying simplify bug (cherry-pick from specialize branch)

a && a -> false
Fix race condition in Makefile