Branch for 2.5; update guava
Remove dead code
Replace PropertiesCollector with AnnotationIntrospector
Merge branch '2.5' into annotation-introspector-2.4

Conflicts:
	version.sbt
Merge branch 'master' into 2.5

Conflicts:
	version.sbt
Merge branch 'master' into 2.5
Merge branch 'master' into 2.5
Final fixups
Merge branch 'annotation-introspector'
Testing the OpenJDK theory
Sayonara, Java 6-san. Ganbatte.