Initial commit of upgrade to django 1.7