Removed broken generators and sped up calls to Uniform.
Merge branch 'master' of https://github.com/phil-mansfield/num