Mac

minor mac compatibility stuff
Merge branch 'master' of https://github.com/derricw/aibs