Updating with djangocon 2013 tweaks.