diff --git a/LICENSE b/LICENSE
index 1f01e2b3..14bac739 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Nodejitsu Inc.
+Copyright (C) 2011 Charlie Robbins and the Contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/lib/nconf.js b/lib/nconf.js
index 35271b3c..8ae2d76c 100644
--- a/lib/nconf.js
+++ b/lib/nconf.js
@@ -1,7 +1,7 @@
 /*
  * nconf.js: Top-level include for the nconf module
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/common.js b/lib/nconf/common.js
index 9d0a409e..4e7ba7b3 100644
--- a/lib/nconf/common.js
+++ b/lib/nconf/common.js
@@ -1,7 +1,7 @@
 /*
  * utils.js: Utility functions for the nconf module.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/formats.js b/lib/nconf/formats.js
index f32268c2..8ef210d3 100644
--- a/lib/nconf/formats.js
+++ b/lib/nconf/formats.js
@@ -1,7 +1,7 @@
 /*
  * formats.js: Default formats supported by nconf
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/provider.js b/lib/nconf/provider.js
index 5acfc970..5a3d98fe 100644
--- a/lib/nconf/provider.js
+++ b/lib/nconf/provider.js
@@ -1,7 +1,7 @@
 /*
  * provider.js: Abstraction providing an interface into pluggable configuration storage.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/stores/argv.js b/lib/nconf/stores/argv.js
index 60c41713..359cb8d3 100644
--- a/lib/nconf/stores/argv.js
+++ b/lib/nconf/stores/argv.js
@@ -1,7 +1,7 @@
 /*
  * argv.js: Simple memory-based store for command-line arguments.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/stores/env.js b/lib/nconf/stores/env.js
index 87357339..aa775f37 100644
--- a/lib/nconf/stores/env.js
+++ b/lib/nconf/stores/env.js
@@ -1,7 +1,7 @@
 /*
  * env.js: Simple memory-based store for environment variables
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/stores/file.js b/lib/nconf/stores/file.js
index 729d5f03..f3caaac3 100644
--- a/lib/nconf/stores/file.js
+++ b/lib/nconf/stores/file.js
@@ -1,7 +1,7 @@
 /*
  * file.js: Simple file storage engine for nconf files
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/stores/literal.js b/lib/nconf/stores/literal.js
index c7c1752c..b2aab0f7 100644
--- a/lib/nconf/stores/literal.js
+++ b/lib/nconf/stores/literal.js
@@ -1,7 +1,7 @@
 /*
  * literal.js: Simple literal Object store for nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/lib/nconf/stores/memory.js b/lib/nconf/stores/memory.js
index e3b36f5d..60afc012 100644
--- a/lib/nconf/stores/memory.js
+++ b/lib/nconf/stores/memory.js
@@ -1,7 +1,7 @@
 /*
  * memory.js: Simple memory storage engine for nconf configuration(s)
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
@@ -49,7 +49,7 @@ Memory.prototype.get = function (key) {
     }
     return undefined;
   }
-  
+
   return target;
 };
 
diff --git a/package.json b/package.json
index f33f7ca0..a6ce4346 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,7 @@
   "name": "nconf",
   "description": "Hierarchical node.js configuration with files, environment variables, command-line arguments, and atomic object merging.",
   "version": "0.6.9",
-  "author": "Nodejitsu Inc. <info@nodejitsu.com>",
-  "maintainers": [
-    "indexzero <charlie@nodejitsu.com>"
-  ],
+  "author": "Charlie Robbins <charlie.robbins@gmail.com>",
   "repository": {
     "type": "git",
     "url": "http://github.com/flatiron/nconf.git"
diff --git a/test/common-test.js b/test/common-test.js
index 9924372b..d50c267a 100644
--- a/test/common-test.js
+++ b/test/common-test.js
@@ -1,7 +1,7 @@
 /*
  * common.js: Tests for common utility function in nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/complete-test.js b/test/complete-test.js
index 6ac8ef73..70ad31cb 100644
--- a/test/complete-test.js
+++ b/test/complete-test.js
@@ -1,7 +1,7 @@
 /*
  * complete-test.js: Complete test for multiple stores.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/fixtures/data.js b/test/fixtures/data.js
index 06925af3..8ab2baca 100644
--- a/test/fixtures/data.js
+++ b/test/fixtures/data.js
@@ -1,13 +1,13 @@
 /*
  * data.js: Simple data fixture for configuration test.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 exports.data = {
   isNull: null,
-  literal: 'bazz', 
+  literal: 'bazz',
   arr: ['one', 2, true, { value: 'foo' }],
   obj: {
     host: 'localhost',
diff --git a/test/fixtures/scripts/nconf-argv.js b/test/fixtures/scripts/nconf-argv.js
index 65de1757..1689031f 100644
--- a/test/fixtures/scripts/nconf-argv.js
+++ b/test/fixtures/scripts/nconf-argv.js
@@ -1,10 +1,10 @@
 /*
  * default-argv.js: Test fixture for using optimist defaults with nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 var nconf = require('../../../lib/nconf').argv().env();
 
 process.stdout.write(nconf.get('something'));
\ No newline at end of file
diff --git a/test/fixtures/scripts/nconf-change-argv.js b/test/fixtures/scripts/nconf-change-argv.js
index 7b2e7a09..b7e77031 100644
--- a/test/fixtures/scripts/nconf-change-argv.js
+++ b/test/fixtures/scripts/nconf-change-argv.js
@@ -1,10 +1,10 @@
 /*
  * nconf-change-argv.js: Test fixture for changing argv on the fly
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 var nconf = require('../../../lib/nconf').argv();
 
 //
diff --git a/test/fixtures/scripts/nconf-env.js b/test/fixtures/scripts/nconf-env.js
index e8032dec..3f6b116a 100644
--- a/test/fixtures/scripts/nconf-env.js
+++ b/test/fixtures/scripts/nconf-env.js
@@ -1,10 +1,10 @@
 /*
  * nconf-env.js: Test fixture for using process.env defaults with nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 var nconf = require('../../../lib/nconf').env();
 
 process.stdout.write(nconf.get('SOMETHING'));
\ No newline at end of file
diff --git a/test/fixtures/scripts/nconf-hierarchical-file-argv.js b/test/fixtures/scripts/nconf-hierarchical-file-argv.js
index 54e58b07..3c6b2933 100644
--- a/test/fixtures/scripts/nconf-hierarchical-file-argv.js
+++ b/test/fixtures/scripts/nconf-hierarchical-file-argv.js
@@ -1,11 +1,11 @@
 /*
  * nconf-hierarchical-file-argv.js: Test fixture for using optimist defaults and a file store with nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  * (C) 2011, Sander Tolsma
  *
  */
- 
+
 var path = require('path'),
     nconf = require('../../../lib/nconf');
 
diff --git a/test/fixtures/scripts/nconf-hierarchical-load-merge.js b/test/fixtures/scripts/nconf-hierarchical-load-merge.js
index 4945cfda..54f7d5a2 100644
--- a/test/fixtures/scripts/nconf-hierarchical-load-merge.js
+++ b/test/fixtures/scripts/nconf-hierarchical-load-merge.js
@@ -1,11 +1,11 @@
 /*
  * nconf-hierarchical-load-merge.js: Test fixture for loading and merging nested objects across stores.
  *
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012, Charlie Robbins and the Contributors.
  * (C) 2012, Michael Hart
  *
  */
- 
+
 var path = require('path'),
     nconf = require('../../../lib/nconf');
 
diff --git a/test/fixtures/scripts/nconf-hierarchical-load-save.js b/test/fixtures/scripts/nconf-hierarchical-load-save.js
index ae2771e9..cedc4b12 100644
--- a/test/fixtures/scripts/nconf-hierarchical-load-save.js
+++ b/test/fixtures/scripts/nconf-hierarchical-load-save.js
@@ -1,16 +1,16 @@
 /*
  * nconf-hierarchical-load-save.js: Test fixture for using optimist, envvars and a file store with nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 var fs = require('fs'),
     path = require('path'),
     nconf = require('../../../lib/nconf');
 
 //
-// Setup nconf to use (in-order): 
+// Setup nconf to use (in-order):
 //   1. Command-line arguments
 //   2. Environment variables
 //   3. A file located at 'path/to/config.json'
diff --git a/test/fixtures/scripts/nconf-nested-env.js b/test/fixtures/scripts/nconf-nested-env.js
index cfc33657..56f95c0b 100644
--- a/test/fixtures/scripts/nconf-nested-env.js
+++ b/test/fixtures/scripts/nconf-nested-env.js
@@ -1,11 +1,11 @@
 /*
  * nconf-nested-env.js: Test fixture for env with nested keys.
  *
- * (C) 2012, Nodejitsu Inc.
+ * (C) 2012, Charlie Robbins and the Contributors.
  * (C) 2012, Michael Hart
  *
  */
- 
+
 var nconf = require('../../../lib/nconf').env('_');
 
 process.stdout.write(nconf.get('SOME:THING'));
diff --git a/test/fixtures/scripts/provider-argv.js b/test/fixtures/scripts/provider-argv.js
index 04924749..42eb2774 100644
--- a/test/fixtures/scripts/provider-argv.js
+++ b/test/fixtures/scripts/provider-argv.js
@@ -1,10 +1,10 @@
 /*
  * provider-argv.js: Test fixture for using optimist defaults with nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 var nconf = require('../../../lib/nconf');
 
 var provider = new (nconf.Provider)().argv();
diff --git a/test/fixtures/scripts/provider-env.js b/test/fixtures/scripts/provider-env.js
index e5027b4b..4ac7af7f 100644
--- a/test/fixtures/scripts/provider-env.js
+++ b/test/fixtures/scripts/provider-env.js
@@ -1,10 +1,10 @@
 /*
  * provider-argv.js: Test fixture for using process.env defaults with nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
- 
+
 var nconf = require('../../../lib/nconf');
 
 var provider = new (nconf.Provider)().env();
diff --git a/test/helpers.js b/test/helpers.js
index 8a891014..b6e034d6 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -1,7 +1,7 @@
 /*
  * helpers.js: Test helpers for nconf.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/hierarchy-test.js b/test/hierarchy-test.js
index 635df4d1..59edcaba 100644
--- a/test/hierarchy-test.js
+++ b/test/hierarchy-test.js
@@ -1,7 +1,7 @@
 /*
  * hierarchy-test.js: Basic tests for hierarchical file stores.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
@@ -52,16 +52,16 @@ vows.describe('nconf/hierarchy').addBatch({
             that = this,
             data = '',
             child;
-        
+
         try { fs.unlinkSync(configFile) }
         catch (ex) { }
-        
+
         child = spawn('node', [script].concat(argv));
-        
+
         child.stdout.on('data', function (d) {
           data += d;
         });
-        
+
         child.on('exit', function () {
           fs.readFile(configFile, 'utf8', that.callback.bind(null, null, data));
         });
diff --git a/test/mocks/mock-store.js b/test/mocks/mock-store.js
index 98b57c82..4a6c1f39 100644
--- a/test/mocks/mock-store.js
+++ b/test/mocks/mock-store.js
@@ -1,7 +1,7 @@
 /*
  * mock-store.js: Mock store for ensuring certain operations are actually called.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
@@ -28,9 +28,9 @@ Mock.prototype.save = function (value, callback) {
     callback = value;
     value = null;
   }
-  
+
   var self = this;
-  
+
   setTimeout(function () {
     self.emit('save');
     callback();
diff --git a/test/nconf-test.js b/test/nconf-test.js
index 39b6227d..091ea09a 100644
--- a/test/nconf-test.js
+++ b/test/nconf-test.js
@@ -1,7 +1,7 @@
 /*
  * file-store-test.js: Tests for the nconf File store.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/provider-save-test.js b/test/provider-save-test.js
index 5ca528a7..75339b7e 100644
--- a/test/provider-save-test.js
+++ b/test/provider-save-test.js
@@ -1,19 +1,19 @@
 /*
  * provider-save-test.js: Ensures consistency for Provider `save` operations.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
 var assert = require('assert'),
     vows = require('vows'),
     nconf = require('../lib/nconf');
-    
+
 //
 // Expose `nconf.Mock`
 //
 require('./mocks/mock-store');
-    
+
 vows.describe('nconf/provider/save').addBatch({
   "When using nconf": {
     "an instance of 'nconf.Provider'": {
@@ -25,7 +25,7 @@ vows.describe('nconf/provider/save').addBatch({
           topic: function () {
             var mock = nconf.stores.mock,
                 that = this;
-                
+
             mock.on('save', function () { that.saved = true });
             nconf.save(this.callback);
           },
diff --git a/test/provider-test.js b/test/provider-test.js
index 34e97f57..ac4c5fdc 100644
--- a/test/provider-test.js
+++ b/test/provider-test.js
@@ -1,7 +1,7 @@
 /*
  * provider-test.js: Tests for the nconf Provider object.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/stores/argv-test.js b/test/stores/argv-test.js
index 9dbf3a91..85bedab5 100644
--- a/test/stores/argv-test.js
+++ b/test/stores/argv-test.js
@@ -1,7 +1,7 @@
 /*
  * argv-test.js: Tests for the nconf argv store.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/stores/env-test.js b/test/stores/env-test.js
index 6ae4cb08..8811af65 100644
--- a/test/stores/env-test.js
+++ b/test/stores/env-test.js
@@ -1,7 +1,7 @@
 /*
  * env-test.js: Tests for the nconf env store.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/stores/file-store-test.js b/test/stores/file-store-test.js
index c83943f0..6a172903 100644
--- a/test/stores/file-store-test.js
+++ b/test/stores/file-store-test.js
@@ -1,7 +1,7 @@
 /*
  * file-store-test.js: Tests for the nconf File store.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
@@ -109,11 +109,11 @@ vows.describe('nconf/stores/file').addBatch({
     "the save() method": {
       topic: function (tmpStore) {
         var that = this;
-        
+
         Object.keys(data).forEach(function (key) {
           tmpStore.set(key, data[key]);
-        });        
-        
+        });
+
         tmpStore.save(function () {
           fs.readFile(tmpStore.file, function (err, d) {
             fs.unlinkSync(tmpStore.file);
diff --git a/test/stores/literal-test.js b/test/stores/literal-test.js
index 368ebe57..6de5c070 100644
--- a/test/stores/literal-test.js
+++ b/test/stores/literal-test.js
@@ -1,7 +1,7 @@
 /*
  * literal-test.js: Tests for the nconf literal store.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
diff --git a/test/stores/memory-store-test.js b/test/stores/memory-store-test.js
index dbcd4480..76489cac 100644
--- a/test/stores/memory-store-test.js
+++ b/test/stores/memory-store-test.js
@@ -1,7 +1,7 @@
 /*
  * memory-store-test.js: Tests for the nconf Memory store.
  *
- * (C) 2011, Nodejitsu Inc.
+ * (C) 2011, Charlie Robbins and the Contributors.
  *
  */
 
@@ -85,7 +85,7 @@ vows.describe('nconf/stores/memory').addBatch({
       },
       "when merging into an existing Object value": function (store) {
         store.set('merge:object', {
-          prop1: 2, 
+          prop1: 2,
           prop2: 'prop2',
           prop3: {
             bazz: 'bazz'
@@ -101,7 +101,7 @@ vows.describe('nconf/stores/memory').addBatch({
           bar: 'foo',
           bazz: 'bazz'
         });
-        assert.equal(store.get('merge:object:prop4').length, 2);        
+        assert.equal(store.get('merge:object:prop4').length, 2);
       }
     }
   },