Issue #86: Mods to makefiles
Issue #87: Libs no longer always rebuilt
Merge remote-tracking branch 'origin/Issue#86'