* #296 renamed configuration.json to ocelot.json in preparation
* removed things we dont need for tests
* another file we dont need
* removed some async we dont need
* refactoring to consolidate configuration code
* removed another pointless abstraction
* #296 started writing merge code
* #296 coming up with ideas for this config merging
* #296 still hacking this idea around
* #296 will now do a crappy merge on the configuration
* #296 change so tests pass on windows
* hacked together load balancing reroutes in fileconfig
* some renaming and refactoring
* more renames
* hacked away the old config json
* test for issue 213
* renamed key
* dont share ports
* oops
* updated docs
* mvoed docs around
* port being used
* hacking around to work out why logging and request id isnt working
* pass request id into logger so it can be structured, removed a bunch of debug logging we dont need because diagnostic trace gets it
* changed config dependency
* always have tracing available
* made it so we dont need to pass config into services.AddOcelot anymore with .net core 2.0
* add test
* lots of changes relating to logging and request ids, also updated documentation
* fixed failing test i missed
