Do we already have a dep on guava? If so, replace this with Maps.newTreeMap()

http://docs.guava-libraries.googlecode.com/git/javadoc/com/google/common/collect/Maps.html#newTreeMap()