imathis/octopress — pull request #979 by FranklinChen (2013-01-28 02:48:36+00:00)
Title: Make sure the user configs override the default configs, rather than vice versa.

The bug was having the defaults override the user configs during the merge.