2013 06 chicago

Third attempt to merge copyedits to chicago branch