Clean up and furbish configuration

Re-order much code to provide more logical grouping
Ignore more cache and save files
Add a missing package
Improve and fix the Makefile