OS X changes
Merge branch 'master' of https://github.com/open-ephys/GUI
Merge branch 'master' of https://github.com/open-ephys/GUI
Merge branch 'master' of https://github.com/open-ephys/GUI
Merge branch 'master' of https://github.com/open-ephys/GUI
Clean up OS X environment
Merge branch 'master' of https://github.com/open-ephys/GUI