Re #274, revert the delete of .travis.yml
PEP8 and python 2.4 support.
python 2.4 support fix re #274
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Update changelog
Re #269, rename Dummy to ProcessResources to be clearer about the usage
PEP8