Removed in-app-payments waffle
fix waffle numbers
remove bad test.  r=mat
remove `marketplace` waffle switch (omg)