Merge pull request #4 from vellamike/master

Merge
Function renaming, swapping scipy annealing to basinhopping, external simulator with multiple traces.
Merge https://github.com/pfriedrich/optimizer
Typo fix