fixed cp35116

modified importer, added extra checks before already loaded module is considered a match
added test, added entry for test_imp.py
fixed cp35126

the exception reports type of the correct argument
Fix broken command line in the `Makefile`.

The argument including ';' should be quoted because the it will be
interpreted as the end of the line by the ordinary UNIX shells.

(cherry picked from commit 485ebcfe0f8e635ae45672d77016afa9c8e9017f)
Merge remote-tracking branch 'paweljasinski/cp35116' into ipy-2.7-maint
Merge remote-tracking branch 'paweljasinski/cp35126' into ipy-2.7-maint