update Makefile infrastructure for 0.3f bump shared library versions fix some merge problems
existent', not