Merge pull request #1 from LearningToTalk/master

merging master into marybeckman fork
Added the "Mac via RDC" option to "location" possibilities.
Merge pull request #11 from marybeckman/master

Added the "Mac via RDC" option for "location" for segmenters working on the UMN server as a remote desktop virtual machine over a VPN connection.