Merge branch 'master' of https://github.com/lmfit/lmfit-py
Merge branch 'master' of https://github.com/lmfit/lmfit-py
Merge branch 'master' of https://github.com/lmfit/lmfit-py
Merge branch 'master' of https://github.com/lmfit/lmfit-py
TEST: enhance detection nosetests
Merge pull request #84 from sciunto/matplotlib

Enhancement of Matplotlib import with nosetests