Cleaned up conf files a bit, removed extra deps.

Removed guice.
Cleaned up yaml conf