Update to use new Apache Licensing

@jish please take a look.