Merge pull request #29 from szimmers/ticket130917_build_stuff

easier building
update some libs

changes from osx
Merge pull request #30 from szimmers/ticket130917_osx_changes

update some libs
dist was ignored