set non-epics-emulator mode
remove cruft
more explicit test in DeviceCounter
updated .gitignore
fixed merge conflicts