Update
Merge branch 'macosx' of github.com:baskerville/bin into macosx