Make bootstrap-conf work on OSX
Merge pull request #159 from nicklan/osx-fixes

Make bootstrap-conf work on OSX