diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..26c75d8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,53 @@
+*.py[cod]
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+.testrepository
+.venv
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Complexity
+output/*.html
+output/*/index.html
+
+# Sphinx
+doc/build
+
+# pbr generates these
+AUTHORS
+ChangeLog
+
+# Editors
+*~
+.*.swp
+.*sw?
+
diff --git a/tools/config-generator.conf b/tools/config-generator.conf
index f110c09..701f590 100644
--- a/tools/config-generator.conf
+++ b/tools/config-generator.conf
@@ -9,4 +9,3 @@ namespace = oslo.db
 namespace = oslo.log
 namespace = oslo.messaging
 namespace = oslo.policy
-
diff --git a/tools/gen-config b/tools/gen-config
old mode 100644
new mode 100755
index 2bdd1cd..61eb6b3
--- a/tools/gen-config
+++ b/tools/gen-config
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 oslo-config-generator --config-file=tools/config-generator.conf
-
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 688f528..9bb25d5 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -12,11 +12,10 @@
 
 from __future__ import print_function
 
+import install_venv_common as install_venv
 import os
 import sys
 
-import install_venv_common as install_venv
-
 
 def print_help(venv, root):
     help = """
@@ -25,7 +24,7 @@ def print_help(venv, root):
     Kingbird development uses virtualenv to track and manage Python
     dependencies while in development and testing.
 
-    To activate the Nova virtualenv for the extent of your current shell
+    To activate the Kingbird virtualenv for the extent of your current shell
     session you can run:
 
     $ source %s/bin/activate
@@ -62,5 +61,6 @@ def main(argv):
     install.install_dependencies()
     print_help(venv, root)
 
+
 if __name__ == '__main__':
     main(sys.argv)
diff --git a/tools/setup-service b/tools/setup-service
old mode 100644
new mode 100755
index ac025ab..e587604
--- a/tools/setup-service
+++ b/tools/setup-service
@@ -5,7 +5,7 @@ if [ $# -ne 2 ]; then
   exit -1
 fi
 
-PORT=8778
+PORT=8118
 HOST=$1 # Put your host IP here
 SVC_PASSWD=$2
 
@@ -13,9 +13,9 @@ SERVICE_ID=$(openstack service show kingbird -f value -cid 2>/dev/null)
 if [[ -z $SERVICE_ID ]]; then
   SERVICE_ID=$(openstack service create \
     --name kingbird \
-    --description 'Kingbird Service V1' \
+    --description 'Kingbird Service V1.0' \
     -f value -cid \
-    synchronisation)
+    multisite)
 fi
 
 if [[ -z $SERVICE_ID ]]; then
@@ -44,4 +44,3 @@ openstack role add \
   service \
   --user kingbird \
   --project demo
-
diff --git a/tools/with-env.sh b/tools/with_venv.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tools/with-env.sh
rename to tools/with_venv.sh