Beginning of major rework of base install. Update makefile to get latest versions of core and contrib in the codebase.

Remove cruft features; these will be replaced with updated features.