Merge pull request #7 from williamspatrick/pprint-settings

Make settings_file.py more git-diff friendly.