Major cleanups and fixes to the nick updates
Merge branch 'master' of 10.0.0.5:/home/rc1140/dev/zaconv into apull

Conflicts:
	badgeCode/src/combined/combined.ino
Minor cleanups
Final fixes