pep8
Merge branch 'master' of github.com:BrightcoveOS/Diamond