Merge pull request #160 from glomium/master

added tox-support for automated testing