New config on master

This fixes #109

This pull request is huge so be careful before merging. Make sure you've tested the new builder before using it.