* #280 can now add response headers inc trace id, now need to consolidate the header place holder stuff
* #280 changed port for linux tests
* #280 lots of hacking around to handle errors and consolidate placeholders into one class
* #268 added waiter to test, altho i wasn't able to replicate flakeyness with wait anyway! Hopefully this will be solid now!
* #268 fixed a warning
* #268 more code coverage
* 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
* moving things around to see if I can get consul to store fileconfiguration rather than ocelotconfiguration
* more refactoring to see if we can get a test for the feature
* acceptance test passing for updating in consul..need to sort object comparison out
* fixed the failing tests