Upgraded to broccoli 0.6 and fixed Broccoli files to make compatible