internal: More work/fixes on how default/theme/user configs are merged. Change how the code is organized to have better data flow. Add some tests.

cov-core==1.15.0
coverage==4.0.3
invoke==0.12.2
mock==1.0.1
pytest==2.8.7
pytest-cov==2.2.1
pytest-mock==0.10.1