Fixes for Darwin.
Merge branch 'master' of github.com:dezi/raspi