Merge branch 'master' into notebook
Merge branch 'notebook' of https://github.com/ewancoder/eal into notebook

Conflicts:
	ceal.sh
	peal.sh