Be more explicit about which API keys to use when creating a marketplace
jshint
Fix analytics to identify users properly
Merge pull request #655 from kleinsch/bug-fixin7

Bug Fixin': Part 7