Migrate to Django 1.6
Merge branch 'update_django'
Ignore active copies of setting files
Merge branch 'add_requirements_file'