Merge pull request #1 from diox/remove-mkt-1

Remove mkt/ stuff from Olympia, first pass (bug 973150)
[WIP] Remove mkt/ stuff from Olympia, second pass (bug 973150)