remove solaris, add mac osx
Merge branch 'master' of https://github.com/senbox-org/s2tbx