new server dependencies

These aren't actually dependencies yet, but they will be eventually if
I get my way...

http://article.gmane.org/gmane.comp.systems.beaker.devel/655
Merge "new server dependencies"