Rearranged order of arguments for functions dealing with highlight_code in order to preserve backwards compatability.
Rearranged order of arguments for functions dealing with highlight_code in order to preserve backwards compatability.

ipython/ipython,ipython/ipython