updated turbine to work with spring-cloud-starters and updated libs
fix merge errors and clean up unused code