Let's try fixing this scoping issue
Merge branch 'master' of github.com:theonion/bulbs-cms into firebase