diff --git a/bin/swiftonfile-print-metadata b/bin/swiftonfile-print-metadata
index 0fae3e1..61dd6ad 100755
--- a/bin/swiftonfile-print-metadata
+++ b/bin/swiftonfile-print-metadata
@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import pprint
 import os
 import json
@@ -25,12 +24,12 @@ from swiftonfile.swift.common.utils import read_metadata
 # Parser Setup
 USAGE = "Usage: %prog [options] OBJECT"
 DESCRIPTION = "Where OBJECT is a file or directory which "\
-        "its Gluster for Swift metadata will be printed "\
-        "to standard out"
+    "its Gluster for Swift metadata will be printed "\
+    "to standard out"
 
 parser = OptionParser(usage=USAGE, description=DESCRIPTION)
 parser.add_option("-J", "--json", dest="json_format", action="store_true",
-        default=False, help="Print output in JSON format")
+                  default=False, help="Print output in JSON format")
 
 (options, args) = parser.parse_args()
 
@@ -41,4 +40,3 @@ if options.json_format:
     print json.dumps(read_metadata(args[0]))
 else:
     pprint.pprint(read_metadata(args[0]))
-
diff --git a/doc/markdown/quick_start_guide.md b/doc/markdown/quick_start_guide.md
index 05c25d1..3f20815 100644
--- a/doc/markdown/quick_start_guide.md
+++ b/doc/markdown/quick_start_guide.md
@@ -27,7 +27,7 @@ This guide will not provide detailed information on how to prepare a SAIO setup
 
 ### Install SwiftOnfile
 
-1. `cd $HOME; git clone https://github.com/swiftonfile/swiftonfile.git`
+1. `cd $HOME; git clone https://github.com/openstack/swiftonfile.git`
 1. `cd $HOME/swiftonfile; python setup.py develop; cd $HOME`
  
 ### Configure SwiftOnFile as Storage Policy
diff --git a/setup.py b/setup.py
index 822f8cc..22d6cc4 100644
--- a/setup.py
+++ b/setup.py
@@ -20,11 +20,11 @@ from swiftonfile.swift import _pkginfo
 setup(
     name=_pkginfo.name,
     version=_pkginfo.full_version,
-    description='SwiftOnfile',
+    description='SwiftOnFile',
     license='Apache License (2.0)',
     author='Red Hat, Inc.',
     author_email='gluster-users@gluster.org',
-    url='https://github.com/swiftonfile/swiftonfile',
+    url='https://github.com/openstack/swiftonfile',
     packages=find_packages(exclude=['test', 'bin']),
     test_suite='nose.collector',
     classifiers=[
diff --git a/swiftonfile.spec b/swiftonfile.spec
index 7e02b32..66980f5 100644
--- a/swiftonfile.spec
+++ b/swiftonfile.spec
@@ -48,6 +48,7 @@ cp -r etc/*   %{buildroot}/%{_confdir}/
 %{python_sitelib}/swiftonfile
 %{python_sitelib}/swiftonfile-%{_version}*.egg-info
 %{_bindir}/swiftonfile-print-metadata
+%{_bindir}/swiftonfile-migrate-metadata
 
 %dir %{_confdir}
 %config(noreplace) %{_confdir}/object-server.conf-swiftonfile
diff --git a/tox.ini b/tox.ini
index 4a729a4..59bf0de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,11 +37,6 @@ setenv = VIRTUAL_ENV={envdir}
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
-# To be used by Jenkins
-[testenv:functest-ci]
-changedir = {toxinidir}
-commands = bash ./.functests-ci -q
-
 [testenv:functest]
 changedir = {toxinidir}
 commands = bash ./.functests -q
@@ -50,15 +45,12 @@ commands = bash ./.functests -q
 changedir = {toxinidir}
 commands =
   flake8 swiftonfile test setup.py
+  flake8 --filename=swiftonfile* bin
 
 [testenv:venv]
 changedir = {toxinidir}
 commands = {posargs}
 
-[testenv:run]
-changedir = {toxinidir}
-commands = bash tools/tox_run.sh
-
 [flake8]
 # it's not a bug that we aren't using all of hacking
 # H102 -> apache2 license exists