attempt at osx build
merge fixes
Merge branch 'master' of https://github.com/rainshapes/zatcap
added local linux.cpp
cleaned up makefile
Merge pull request #1 from rainshapes/master

osx build attempt