fix(theme): deep merge configs
#3967

curbengh wants to merge curbengh:deepmerge_theme_config into hexojs:master

We do not currently have an analysis of these two commits