Added __init__.py to the tests directory so that relative package import works.
Merge pull request #3 from bforst/master

Added __init__.py so tests can be run
Merge remote-tracking branch 'upstream/master'