Make references to Server consistent
Make references to Server consistent

Change-Id: I4e1857a198b73160a2a7f6e9e48b4e62ee1a6731
Reviewed-on: http://review.engineyard.com/97
Reviewed-by: Andre Arko <84de7f247766c9f87e4737d92fee235e10beaf0d@engineyard.com>
Tested-by: Andre Arko <84de7f247766c9f87e4737d92fee235e10beaf0d@engineyard.com>

engineyard/engineyard-serverside,engineyard/engineyard-serverside,engineyard/engineyard-serverside,engineyard/engineyard-serverside