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

This (almost) completely removes mkt/.
Merge pull request #2 from diox/remove-mkt-2

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