Fixed contourf filling bug
Added optional keyword argument to switch off plotting of data points
Fixed placement of confidence intervals
reverted tabs to spaces
Merge branch 'master' into geoff

Conflicts:
	triangle.py