Bunch of build changes to work with bsp-grunt