Merge pull request #1 from dghubble/master

Catch-up
brew instead of apt-get if on OS X