Merge pull request #24 from stuart-warren/next

Now resolves local hostname and username once on startup
Reordered json creation

Quickly changed json creation order so that you can override most
fields with the MDC should you choose.