ignore java version management file used by jenv.
Use less verbose more efficient code, replace filter(_.isDefined).map(...) with flatmap
remove some changes from history out of scope
Refactor move method: Don't go peeking into others privates to do your job

Summary:
Move a method to the one and only class that uses it.
Merge branch 'master' into gabe-cleanups

Conflicts:
	app/collins/solr/SolrUpdater.scala
Merge pull request #179 from tumblr/gabe-cleanups

Bhaskar cleanups