Misc 20131214

Makes `Data` handle `%APP%` in the path which can be set by the application, e.g. logging can search config in `%APP%/config.yaml` (which user can set to the appropriate directory).

Also fixes a bug in config when merging with an empty config.