Defend against shoddy type inf, close #35
Reformulation simplified and fix, ellipse printing
Merge pull request #36 from IainNZ/fixellipse

Reformulation simplified and fix, ellipse printing
Merge branch 'master' into samplerework

Conflicts:
	src/oracle_gen.jl