changes merged

changes from gkronmiller-lshin and egaebler-mchesley halves of the
groups have been merged (I think). branch will be pushed to server, then
downloaded to the ipad to check that all is well before merging this
branch into master.