Merge pull request #1 from audioscience/master

Pulling in upstream
Merge pull request #2 from audioscience/master

Pulling in upstream
Merge pull request #21 from denniszhuo/master

Updated lib and command line application
Merge pull request #3 from audioscience/master

Pulling in upstream
controller: lib: timer, timeout() returns bool
controller: lib: AEM controller, make some fns private. Remove method remove_inflight_cmd() as it is short.
Merge pull request #23 from andrew-elder/master

aem controller tidy
Merge pull request #4 from audioscience/master

Pulling in upstream
Updates to OS specific functions for Mac OSX
Initial implementation of OSX support
Merge pull request #24 from ajwlucas/master

First pass at an OSX implementation
controller: lib: start ACMP
Merge pull request #25 from andrew-elder/master

controller: lib: start ACMP
controller:app: Added implementation for command line functions for
displaying available instreams, outstreams, and to connect an instream
to an outstream.