Removed @Factory annotations, because we no longer use generate code, and deprecated the annotation interface so that existing third-party code continues to compile.
Addressed some analysis warnings
Added a @SafeVarargs annotation now we're Java 7+
Added CoreMatchers back in (now not autogenerated) and removed compile warnings.