merge in updates from Klout repo

Need to pull in changes before pushing out