Updated to Django 1.5
Merge branch 'master' of github.com:JohnMichaelFFS/ourstorybook