Merge pull request #3 from msabramo/cabrera-py33_fixes_tweak_except

Update py33_fixes from linsomniac:master and add fix in PR #35
.travis.yml: Add 3.3