Fix to guard configuration

This fixes a bug where it was impossible to set options in the Guardfile since the defaults were being merged into the user-supplied options, rather than the other way around.