std-524
Merge branch 'contributions' of https://github.com/theonion/bulbs-cms into contributions