Tox is broken for python 2.5
Merge branch 'master' of github.com:BrightcoveOS/Diamond