Completed usertracker.cfg file
Cleaned up macro definitions and default value declarations.

Signed-off-by: Chris Bell <cwbell@mail.usf.edu>
Merge branch 'master' into config-dev
Incorporate changes from f02f22
Modified to fix conflitcs

Conflicts:
	ChangeLog
	IpInterface.h
	buildNum
	configuration.h
	main.cpp
	srvBuildNum

Signed-off-by: Chris Bell <cwbell@mail.usf.edu>