Updates to Stonesense OS X build

Apologies for the slightly messy commit history...if that's a problem, then I won't be offended if you don't want to merge this ;-)