Removed expensive test code
Added a preprocessor to disable bubble merging to
prevent self-overlapping bubbles
Merge branch 'master' into bubblecheck

Conflicts:
	src/Vertex.cpp