osx needs astyle-osx executable
OSX configs fernflower to decompile properly
Merging from branch 'master'