getopt requires unistd.h
resolve merge conflicts on gltest; note unistd is needed on mac os for getopt