PEP8
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Re #546, fix typo