fixing settings so we can merge
fixing settings so we can merge

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