Apache 2.4

This compiles and seems to pass its tests. There are still several non-fatal compile-time warnings.