Added initial pretty_print methods.
Merge branch 'dropbox/master' into pretty-print
Merge branch 'pretty-print'