Changes to compile on mavricks, with brew dependencies.