Added note about problems with net-ssh versions > 2.8.0
if someone specifies prompt only, make sure conf isnt nil
syntax linters dont like this
whitespace
bump version for release
Merge pull request #171 from tumblr/will-update-deploy-docs

Added note about problems with net-ssh versions > 2.8.0
bump date
Merge pull request #177 from tumblr/gabe-more-collinsauth-fixing

Gabe more collinsauth fixing
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.
Avoid querying the database for an asset when adding an asset to the list of
asset to index in Solr. The same query is repeated during reindexing, lets just do it once.
Merge pull request #180 from tumblr/gabe-fewer-solr-queries

Avoid querying the database for an asset when adding an asset to the lis...
Merge branch 'master' into gabe-cleanups

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

Bhaskar cleanups
clean up algorithm for IP allocation to respect boundaries properly
cover cases straddling octet boundaries
whoops, use precomputed maxAddress
Merge pull request #181 from tumblr/gabe-fix-ipallocation

Gabe fix ipallocation