Changed setup.py and __init__.py so setup.py install results are in line with examples given in readme
Merge pull request #16 from holbech/setup-py-fix

setup.py change for pip-interoperability