merge in from klout repo

Merge in any new changes from the clout repo into my personal repo ...