Replaced #include "PointVector.h" with #include "Geometry.h" and improved the makefile a bit.
Merge branch 'clean' into development