slight merge
slight merge

QLGu/djangopackages,pydanny/djangopackages,QLGu/djangopackages,nanuxbe/djangopackages,benracine/opencomparison,nanuxbe/djangopackages,QLGu/djangopackages,nanuxbe/djangopackages,audreyr/opencomparison,benracine/opencomparison,miketheman/opencomparison,pydanny/djangopackages,audreyr/opencomparison,pydanny/djangopackages,miketheman/opencomparison