Branched -- do not commit manage.py or settings.py