git is screwing me
Merge branch 'master' of github.com:mpharrigan/quant-accel
Merge branch 'maccel' of github.com:mpharrigan/quant-accel into maccel
notebooks
notebook
Merge branch 'master' of github.com:mpharrigan/quant-accel

Conflicts:
	src/quantaccel/build_msm_from_cluster.py
	src/quantaccel/make_jobs.py
Merge branch 'maccel'