MATH: Fixed includes in matrix.h and vector.h
MVE: Fixes Makefiles
Merge remote-tracking branch 'upstream/master'
revert change for OSX