Different config file location for live
Merge branch 'master' into robhogg-live
Bug fix
Bug fix to preserve search order
Another bug fix (date format)
Couple of chart fixes, + one change to make diagnostics easier.
Merge branch 'robhogg-live'