Took out extra spaces, edited comments, fixed line lengths. cjaday
Resolved zombie merge conflicts. rdlarkins cjaday
Removed an outdated TODO. rdlarkins cjaday yyan