Merge pull request #100 from asmaloney/mac_build_fixes

Remove unused vars and...