Update to match upstream changes circa Jan2013.
Merge branch 'master' into dev
Add tkp.cfg, enable MongoDB.
Merge branch 'master' into dev