New binnings
Updated with OS X config needs, but should work also in Linux
Incroporated latest master