Remove mkt/ stuff from Olympia, second pass (bug 973150)

This (almost) completely removes mkt/.