rearrange osx tasks to make diff more readable, and respond to initial
pull request comments (also renamed mac? -> osx?)