* #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
* removed file
* updated package
* updated package
* updated package
* updated package
* updated package
* updated package
* updated package
* all packages updated
* #295 can add token to service provider config and this will be used by consul clients to get services and configuration
* #295 wait longer for this test
* #212 - hacked websockets proxy together
* faffing around
* #212 hacking away :(
* #212 websockets proxy middleware working
* #212 map when for webockets working
* #212 some test refactor
* #212 temp commit
* #212 websockets proxy working, tests passing...need to do some tidying and write docs
* #212 more code coverage
* #212 docs for websockets
* #212 updated readme
* #212 tidying up after websockets refactoring
* #212 tidying up after websockets refactoring
* #212 tidying up after websockets refactoring
* changing logging levels and logging like ms reccomends with structured data rather than strings
* more faffing
* more fafin
* #287 ocelot logger now only takes strings as it did take params then just turned them to strings, misleading, unit tests for logger and diagnosticlogger
* #287 errors now logged as they happen
* #287 more detail for logs requested in issue
* #287 tidy up
* #287 renamed
* #287 always log context id
* #287 fixed me being an idiot
* #287 removed crap websockets unit test that isnt a unit test
* #287 removed crap websockets unit test that isnt a unit test
* failing test
* failing test but needs real butterfly server running..need to fix that...also worked out ive broken tracing...yey
* brought in butterfly source code so i can work out how to write acceptance tests for this...
* fixed the bug but still need to fix tracing
* tracing working again across services but need to make tracing hook into new Ocelot middleware as it still uses asp.net middleware
* removed butterfly libs brought in for testing
* 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
* removed code where we add a trailing slash as this means if we request /1.txt/ instead of /1.txt then some servers will not return the resource at /1.txt. After reading up it seems if you dont have a trailing slash then its a file, if you do then its a resource
* test for 145
* removed unused code
* fix broken build..my bad
