Merge pull request #18 from ian-r-rose/setup_or_dist

Use setuptools or distutils
add missing test output