Bug/dublicate

Implementing fix for https://github.com/mesosphere/marathon/issues/324
This seems like jamming two components into one. Can we look at making this more generic or just moving it to two separate components?