refactor server/main
and add --merciful flag to avoid the force quit instruments watcher
make sure we don't start FQInstruments on non-mac or mac < 10.9 (fix #1585)
Merge pull request #1603 from jlipps/master

refactor server/main and fix force-kill instruments issues