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
External sim. error handling

If the external simulator returns with returncode=1 in the modelRunner function the combineFeatures function will set the fitness value of the corresponding parameters to 100.
Merge https://github.com/pfriedrich/optimizer

Conflicts:
	optimizer/fitnessFunctions.py
final update
name fix for detailed error window
isi, detectspike fix
error component corrections
Merge https://github.com/pfriedrich/optimizer
remove debug info 

remove debug info from core: error component generation (html)
Merge pull request #75 from pfriedrich/master

merge