Merge pull request #1 from audioscience/master

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

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

Pulling in upstream
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