Fix merge compilation errors
Resolve merge and compliation errors
Merge branch 'mergebbmpi' of github.com:claytronics/meld into mergebbmpi

Conflicts:
	Makefile
	api/api.hpp
	interface.cpp
	sched/nodes/serial.hpp
	vm/predicate.cpp