WIP - Upgrade to latest Playdoh and Django 1.5.5