Merge pull request #153 from jameseck/python_conf_sort

added sort to python.conf.erb options hash
Merge remote-tracking branch 'upstream/master'