fixed linux compilation errors
Merge branch 'master' of https://github.com/kravich/chaostheory_linux