Updating Makefile
Correcting merge fuckup
Re-enabling other binaries
Merge branch 'versioned' into develop
Ensuring correct ordering of versioned packages
Merge branch 'release/0.1.0'