Cleanup
Added brand styleguide into /styleguide, added some watches and tasks to make it easy to build
Fixed merge conflicts