Revert "Update Makefile"

This reverts commit 5bb681353e208285286f24f96c0bd4e2bbae463d.
Port libssp fix from meshbox
Switch back to cjd's master and bump to 0.7