Cleanup w/ lazy connection loading:
* Fixed issues with eager loading connections to ES since rebasing
* Cleaned up the funky spacing and tabs all over the place
* Ensure that everything goes through Escargot's connection management