slight reorganizing, grouping the display format methods together, renamed _format-> _display_format
slight reorganizing, grouping the display format methods together, renamed _format-> _display_format

ipython/ipython,ipython/ipython