Merge com.typesafe.sbtrc.server into sbt.server

The split between these two doesn't seem useful, there's no public
API here anyhow.
Merge pull request #209 from sbt/wip/havocp-combine-server-packages

Merge com.typesafe.sbtrc.server into sbt.server