A couple minor bug fixes, Makefile for the new bluehive system
Fixed git tracking
Merge remote branch 'origin/master'