updated bootstrap, reorganized for optional OSX install