Update OS X build
Fix depreciation warnings and other misc fixes
Merge pull request #1 from penguinflyer5234/general-fixes

General fixes