Changing committer to author date, and DJANGO_COLORS
merging
merge conflict
Doesn't use colored aliases during scripts
Merge branch 'master' into laptop