Updates to fix issues against latest Broccoli 0.7.2

Fixes Issue #3