Merged IPython 0.12.1 and 0.13.2 default configuration