Merge the config branch

This branch is stable and ready for merging. Only thing to do is make update find the right version value.