move mavericks setup out of gist, formatting tweaks