Merge branch 'master' into Dustin
Minor fixes
Merge branch 'Dustin'

Conflicts:
	main.wire
Merge branch 'master' into marty