Merge 'BetterDefaults' branch

Merge 'BetterDefaults' branch.

This pulls https://github.com/ShaneMcC/DFBnc/pull/43 again, plus fixes to actually make it work! ;)