add extra_config_file

and `--config` alias

for loading a single extra config file, e.g.

    ipython notebook --config mycfg.py

which will be strictly in addition to, and at higher priority than, existing config files, profiles, etc.

Note that the loading code hasn't changed, it's just indented to put it in a for-loop.
update config_file_specified in kernel app

it's a set now
a nicer error message when using %pylab magic

If the user specified an unsupported backend, there was no indication
for what the valid names were. Error message prior to this commit:

    In[1]: %pylab xxx
    ERROR: Backend u'xxx' not supported.

after this commit:

    In[1]: %pylab xxx
    ERROR: Backend 'xxx' not supported. Supported backends are: gtk inline osx qt qt4 tk wx
updated .mailmap
Merge pull request #3612 from ivanov/mailmap

updated .mailmap
Merge pull request #3592 from minrk/config-file

add extra_config_file

and --config alias

for loading a single extra config file, e.g.

ipython notebook --config mycfg.py
which will be strictly in addition to, and at higher priority than, existing config files, profiles, etc.

Note that the loading code hasn't changed, it's just indented to put it in a for-loop.

This is added primarily for nbconvert, but the NbConvertApp will need to be fixed to properly inherit flags and aliases from the base application, like all other IPython apps.
Merge pull request #3608 from ivanov/nicer-backend-msg

a nicer error message when using %pylab magic

If the user specified an unsupported backend, there was no indication
for what the valid names were. Error message prior to this commit:

In[1]: %pylab xxx
ERROR: Backend u'xxx' not supported.
after this commit:

In[1]: %pylab xxx
ERROR: Backend 'xxx' not supported. Supported backends are: gtk inline osx qt qt4 tk wx