added data file to new setup.py, removed old one.
merged all fragments into one file. All tests pass.
Merge pull request #44 from lenarother/setup

added data file to new setup.py, removed old one.
Import fixed.
Import fixed.
Merge pull request #48 from lenarother/fragment

merged all fragments into one file. All tests pass.
Merging master in progress