Merge pull request #60 from sciunto/travis

Travis: some fixes
Merge branch 'master' of https://github.com/lmfit/lmfit-py