Updating Makefile
Correcting merge fuckup
Re-enabling other binaries
Merge branch 'versioned' into develop