Cleaned up the namespace.
Merge branch 'master' of https://github.com/ericfourfour/sampler