Revert "Enable swift by default."

This reverts commit 5a5cbf7274a6a50bb766ec590cf885430ed5c5d0.

This breaks on a default openstack install on Ubuntu 12.10,
revert for now until this can be cleaned up to work out of the
box.

Change-Id: I185509cc30bd28e920cdab60fc92129949bd6b0d
diff --git a/unstack.sh b/unstack.sh
index 3ac2985..a086d5c 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -63,7 +63,7 @@
 fi
 
 # Swift runs daemons
-if is_service_enabled s-proxy; then
+if is_service_enabled swift; then
     stop_swift
     cleanup_swift
 fi