Refactored for use with setuptools.
Fixed minor usage text bugs