added bokeh plotting
varia
Merge branch 'master' of https://github.com/abieler/pyComa

Conflicts:
	data_loaders.py
	runHybrid2.py