Squashed merge of firebase branch.
Merge branch 'master' of github.com:theonion/bulbs-cms