Undo changes to dist files that caused merge conflicts

Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
Remove .media-object from docs.

Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>