diff --git a/bin/load_gen b/bin/load_gen
index c3e14e31550ff8e8629f10602c672dc1e6697ee4..5133533408df5bfdbbfa245cd47de825d526cf9b 100755
--- a/bin/load_gen
+++ b/bin/load_gen
@@ -93,7 +93,7 @@ var completed = {
 };
 
 // how many activies does an active user undertake per second
-const activitiesPerUserPerSecond = (40.0 / ( 24 * 60 * 60 )); 
+const activitiesPerUserPerSecond = (40.0 / ( 24 * 60 * 60 ));
 
 // activities
 var activity = {
diff --git a/lib/bcrypt.js b/lib/bcrypt.js
index 704aea87a892125e165907afb12dd23b0ab42fd9..a9c679b611a0f6507146362b3d9236fa2dde92b3 100644
--- a/lib/bcrypt.js
+++ b/lib/bcrypt.js
@@ -48,4 +48,4 @@ exports.shutdown = function() {
     cc.exit();
     cc = undefined;
   }
-};
\ No newline at end of file
+};
diff --git a/lib/db.js b/lib/db.js
index e717029611c4233375b006a3874a79738430ee6d..2cd53f6fbd190626897418bd6805a06f660b527b 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -144,4 +144,4 @@ exports.addTestUser = function() {
   // would we like to check the environment here?
   checkReady();
   driver['addTestUser'].apply(undefined, arguments);
-};
\ No newline at end of file
+};
diff --git a/lib/keysigner/keysigner-compute.js b/lib/keysigner/keysigner-compute.js
index 3f0f108a17d47e55aea1bc9f3d6c10b9e3067209..5226dab15e26e660dee710745c0dff0a1fb0a5a5 100644
--- a/lib/keysigner/keysigner-compute.js
+++ b/lib/keysigner/keysigner-compute.js
@@ -6,7 +6,7 @@ process.on('message', function(m) {
   try {
     // parse the pubkey
     var pk = ca.parsePublicKey(m.pubkey);
-    
+
     // same account, we certify the key
     // we certify it for a day for now
     var expiration = new Date();
diff --git a/lib/load_gen/activities/include_only.js b/lib/load_gen/activities/include_only.js
index a8aa5805b01967b672819ecd598298007e156379..379e0dfed58991d7eaac466c3d225f1a5d365140 100644
--- a/lib/load_gen/activities/include_only.js
+++ b/lib/load_gen/activities/include_only.js
@@ -18,7 +18,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Lloyd Hilaiel <lloyd@hilaiel.com> 
+ *   Lloyd Hilaiel <lloyd@hilaiel.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/lib/load_gen/activities/reset_pass.js b/lib/load_gen/activities/reset_pass.js
index e051eca168c8a307ff152eabb88ec247c1dbd133..ae8a9d8c5b78c2a8922a5e2cc173132cae78f6bf 100644
--- a/lib/load_gen/activities/reset_pass.js
+++ b/lib/load_gen/activities/reset_pass.js
@@ -18,7 +18,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Lloyd Hilaiel <lloyd@hilaiel.com> 
+ *   Lloyd Hilaiel <lloyd@hilaiel.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/lib/load_gen/activities/signup.js b/lib/load_gen/activities/signup.js
index 0ea44f1c230778d0143970a6ccf388e01fe10049..60270fd31500e59982f03274523f818a4f057f45 100644
--- a/lib/load_gen/activities/signup.js
+++ b/lib/load_gen/activities/signup.js
@@ -18,7 +18,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Lloyd Hilaiel <lloyd@hilaiel.com> 
+ *   Lloyd Hilaiel <lloyd@hilaiel.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/lib/load_gen/user_db.js b/lib/load_gen/user_db.js
index 436ae63eff98bf94fc69c527e21d8248755b1717..247100a0c9284ea98bf2a90780086b8aee38f171 100644
--- a/lib/load_gen/user_db.js
+++ b/lib/load_gen/user_db.js
@@ -18,7 +18,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Lloyd Hilaiel <lloyd@hilaiel.com> 
+ *   Lloyd Hilaiel <lloyd@hilaiel.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/lib/secrets.js b/lib/secrets.js
index 41b8d49526a78638ed154081eee91ffff564f125..8ba989a25eee5c7536a765d1c5fe1e7c89533b9a 100644
--- a/lib/secrets.js
+++ b/lib/secrets.js
@@ -61,7 +61,7 @@ exports.generate = function(chars) {
   for (var i=0; i < chars; i++) {
     str += alphabet.charAt(bytes[i] % alphabet.length);
   }
-  
+
   return str;
 }
 
diff --git a/lib/statsd.js b/lib/statsd.js
index 029327e5313d05c738160a3416260f9134b70ad9..dc77b97ce8865affc53fa083b12fbf8c60884a7b 100644
--- a/lib/statsd.js
+++ b/lib/statsd.js
@@ -2,7 +2,7 @@ const
 StatsD = require("node-statsd").StatsD,
 config = require('./configuration');
 
-const PREFIX = "browserid." + config.get('process_type') + "."; 
+const PREFIX = "browserid." + config.get('process_type') + ".";
 
 var statsd = undefined;
 
diff --git a/lib/wsapi.js b/lib/wsapi.js
index 86dca49546185a0426cc4be2b09cc7ebef16694b..58abd381cf4bfd259f2e91f8110cce64fd10a5e7 100644
--- a/lib/wsapi.js
+++ b/lib/wsapi.js
@@ -126,7 +126,7 @@ exports.setup = function(options, app) {
       const operation = purl.pathname.substr(WSAPI_PREFIX.length);
 
       // count the number of WSAPI operation
-      statsd.increment("wsapi." + operation); 
+      statsd.increment("wsapi." + operation);
 
       // check to see if the api is known here, before spending more time with
       // the request.
@@ -135,7 +135,7 @@ exports.setup = function(options, app) {
       {
         // if the fake verification api is enabled (for load testing),
         // then let this request fall through
-        if (operation !== 'fake_verification' || !process.env['BROWSERID_FAKE_VERIFICATION']) 
+        if (operation !== 'fake_verification' || !process.env['BROWSERID_FAKE_VERIFICATION'])
           return httputils.badRequest(resp, "no such api");
       }
 
diff --git a/scripts/hash_password.js b/scripts/hash_password.js
index 2a69912ea7a66adcb9b10460e50c5e2aa7a3ab0d..f73c5e82c129501b7ebc9ada5a60f0c5288770d3 100755
--- a/scripts/hash_password.js
+++ b/scripts/hash_password.js
@@ -35,4 +35,4 @@ bcryptPassword(process.argv[2], function(err, hash) {
     process.exit(1);
   }
   console.log(hash);
-});
\ No newline at end of file
+});
diff --git a/scripts/merge_train.sh b/scripts/merge_train.sh
index 9fafba6dcf7fef5aa648164a86ce91ef9d5a0186..5d0e6e05d29858dbe77eca6da79f033af2f724e4 100755
--- a/scripts/merge_train.sh
+++ b/scripts/merge_train.sh
@@ -9,7 +9,7 @@ git fetch origin
 
 # first, let's identify the train
 TRAIN=`git branch -a | grep remotes/origin/train | sed -e 's/^.*train-\(.*\)$/\1/' | sort -n | tail -1`
-echo "Merging train ($TRAIN) into production" 
+echo "Merging train ($TRAIN) into production"
 
 git checkout -B prod remotes/origin/prod
 git merge --no-ff remotes/origin/train-$TRAIN -m "integrating train $TRAIN"
diff --git a/scripts/serve_example.js b/scripts/serve_example.js
index 1b23aec83134fee06c648e6727cc677aa6f07b38..40952690ea02c607f2a240b96cd99795384549a4 100755
--- a/scripts/serve_example.js
+++ b/scripts/serve_example.js
@@ -61,7 +61,7 @@ exampleServer.post('/process_assertion', function(req, res, next) {
   // An "audience" argument is embedded in the assertion and must match our hostname.
   // Because this one server runs on multiple different domain names we just use
   // the host parameter out of the request.
-  var audience = req.headers['host'] ? req.headers['host'] : localHostname;   
+  var audience = req.headers['host'] ? req.headers['host'] : localHostname;
   var data = querystring.stringify({
     assertion: req.body.assertion,
     audience: audience