diff --git a/.gitignore b/.gitignore
index 3ef41c879..64a96d0a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ build/*
 build-stamp
 nova.egg-info
 .nova-venv
+.venv
 *.sqlite
 *.log
 po/*.pot
\ No newline at end of file
diff --git a/.mailmap b/.mailmap
index 2265c2e22..21bdaaa3a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,6 +25,8 @@
 <jake@ansolabs.com> <jake@markupisart.com>
 <jake@ansolabs.com> <admin@jakedahn.com>
 <jaypipes@gmail.com> <jpipes@serialcoder>
+<jeblair@hp.com> <james.blair@rackspace.com>
+<jeblair@hp.com> <corvus@inaugust.com>
 <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
 <jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
 <jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
diff --git a/Authors b/Authors
index 11e1daa8c..adc7c9c95 100644
--- a/Authors
+++ b/Authors
@@ -55,7 +55,7 @@ Hisaki Ohara <hisaki.ohara@intel.com>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
 Isaku Yamahata <yamahata@valinux.co.jp>
 Jake Dahn <jake@ansolabs.com>
-James E. Blair <james.blair@rackspace.com>
+James E. Blair <jeblair@hp.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index 1e81b4cfa..ce5b721b7 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -96,7 +96,7 @@ Grab the code from GitHub::
 
 Running unit tests
 ------------------
-The unit tests will run by default inside a virtualenv in the ``.nova-venv``
+The unit tests will run by default inside a virtualenv in the ``.venv``
 directory. Run the unit tests by doing::
 
     ./run_tests.sh
@@ -130,7 +130,7 @@ If all goes well, you should get a message something like this::
 To activate the Nova virtualenv for the extent of your current shell session
 you can run::
 
-     $ source .nova-venv/bin/activate
+     $ source .venv/bin/activate
 
 Or, if you prefer, you can run commands in the virtualenv on a case by case
 basis by running::
diff --git a/run_tests.sh b/run_tests.sh
index 23e9783b1..0b2acbc00 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -42,7 +42,7 @@ function process_option {
   esac
 }
 
-venv=.nova-venv
+venv=.venv
 with_venv=tools/with_venv.sh
 always_venv=0
 never_venv=0