fixed the mac install guide to make the gemset the default gemset
fixed merge conflicts