Separated "pretty" into pretty.py
Merge remote-tracking branch 'origin/master'