spray-servlet always crashes on start because it cannot find config "spray.servlet"

Guys, git stuff was so messy in https://github.com/spray/spray/pull/386 so I thought it's easier to create new pull request.

PS. I emailed CLA as well.