Add h-api to suggested ENABLED_SERVICES for Heat

Currently lib/heat says:

    To enable, add the following to localrc
    ENABLED_SERVICES+=,heat,h-api-cfn,h-api-cw,h-eng

Once the stack is up, `heat list` fails because the API server
isn't running.

This commit adds h-api to that list.
Also make sure h-api is killed in stop_heat().

Change-Id: I2e818bb343680b3778f9277c23c766f784d28887
diff --git a/lib/heat b/lib/heat
index 0c95ebb..4d2f84e 100644
--- a/lib/heat
+++ b/lib/heat
@@ -2,7 +2,7 @@
 # Install and start **Heat** service
 
 # To enable, add the following to localrc
-# ENABLED_SERVICES+=,heat,h-api-cfn,h-api-cw,h-eng
+# ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
 
 # Dependencies:
 # - functions
@@ -193,8 +193,8 @@
 
 # stop_heat() - Stop running processes
 function stop_heat() {
-    # Kill the cinder screen windows
-    for serv in h-eng h-api-cfn h-api-cw; do
+    # Kill the screen windows
+    for serv in h-eng h-api h-api-cfn h-api-cw; do
         screen -S $SCREEN_NAME -p $serv -X kill
     done
 }