fix unittest deprecation warnings under python 3.4
Merge pull request #182 from stesla/fix-deprecation-warnings

Fix unittest deprecation warnings under Python 3.4