Merge branch 'eval_components' of github.com:Tillsten/lmfit-py
add CompositeModel, support '+', '-', '*', '/' of models
Merge branch 'master' of https://github.com/lmfit/lmfit-py
a few more tweaks for CompositeModel
Ahh, 'components' must be a property
OrderedDict from CompositeModel.eval_components
format Name collision error to show all collisions
use operator module for CompositeModel
use prefix as default key for Model.eval_components(), and pass params!
use operator.truediv (needed for py3, thanks TravisCI!)
MAINT: if something has the __call__ attribute, then it is callable
Merge pull request #161 from andyfaff/callable

MAINT: if something has the __call__ attribute, then it is callable
improve repr string
add __truediv__ for python3 support
improved docs for model / CompositeModel
ENH: adding differential evolution as a fitting method
MAINT: include _differentialevolution.py in source, not present in scipy until 0.15
avoid adding dict keys and list
Merge branch 'master' of github.com:lmfit/lmfit-py
removed cruft