MPMerge, a much faster sequential merge ported from monad-par code, finally works
added a local build target called local that does not do jenkins hackery
Merge branch 'master' of github.com:iu-parfunc/lvars