[t3275] Better naming for clip types in Media Gallery
Bug 860769 - Update to html5-lint v0.2.1
Bug 858183 - Update knox to v0.7 for node v0.10 compatibility
Butter v1.0.33
[#859295] Convert duration data from a null regex to an int, and not a string.
Merge branch 'master' of github.com:mozilla/butter