Cleaned up the configuration to work in circle

Get everything working with Django 1.6