bug fixes; style changes
Merge branch 'master' of https://github.com/BrightcoveOS/Diamond
Revert "bug fixes; style changes" - Didn't notice upstream changes

This reverts commit cd49e4014fa21cb87f229ee15c4923272659dc6d.
bug fixes
Merge pull request #497 from peterfisher/master

bug fixes