Various tweaks, added in check for blank config
Merge branch 'master' of https://github.com/outrunthewolf/ditto