Fixes Atmosphere/atmosphere#1142
Fixes Atmosphere/atmosphere#1142
removed tab indents
Refactor trackMessagem, use it with atmosphere.js as well