From 5f9a5fc3f02878c7e2f226820817205c51e4403f Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Sun, 15 Jun 2014 22:27:21 +0200
Subject: [PATCH 01/14] * Valid HTML; * Added image dimensions; * Added message
 to leave image alternate text always empty;

---
 views/includes/scriptList.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/views/includes/scriptList.html b/views/includes/scriptList.html
index 657ab633e..20f4a5dd2 100644
--- a/views/includes/scriptList.html
+++ b/views/includes/scriptList.html
@@ -1,10 +1,10 @@
 <table class="table table-hover">
   <thead>
     <tr>
-      <th class="text-center"><a href="?orderBy=name&orderDir=asc">Name</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=installs&orderDir=desc">Installs</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=rating&orderDir=desc">Rating</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=updated&orderDir=desc">Last Updated</a></th>
+      <th class="text-center"><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=installs&amp;orderDir=desc">Installs</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=rating&amp;orderDir=desc">Rating</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=updated&amp;orderDir=desc">Last Updated</a></th>
     </tr>
   </thead>
   <tbody>
@@ -13,13 +13,17 @@
       <td>
         <span class="script-icon hidden-xs">
           {{#icon16Url}}
-          <img src="{{{icon16Url}}}" alt="">
+          <img src="{{{icon16Url}}}" alt="{{! Leave me empty! }}" width="16" height="16" />
           {{/icon16Url}}
           {{^icon16Url}}
           <i class="fa fa-fw fa-file-code-o"></i>
           {{/icon16Url}}
         </span>
-        <a href="{{{scriptPageUrl}}}" class="tr-link-a"><b>{{name}}</b></a>{{#meta.version}} <div class="script-version label label-default">{{meta.version}}</div>{{/meta.version}} <span class="inline-block">by <a href="{{{author.userPageUrl}}}">{{author.name}}</span></a>
+        <a href="{{{scriptPageUrl}}}" class="tr-link-a"><b>{{name}}</b></a>
+        {{#meta.version}}
+        <span class="script-version label label-default">{{meta.version}}</span>
+        {{/meta.version}}
+        <span class="inline-block">by <a href="{{{author.userPageUrl}}}">{{author.name}}</a></span>
         <p>{{meta.description}}</p>
       </td>
       <td class="text-center td-fit">

From 7114acb9e4c30fb7abc34c54a263e648bde8b5aa Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Sun, 15 Jun 2014 22:41:12 +0200
Subject: [PATCH 02/14] * Valid HTML; * Consistency;

---
 views/includes/scriptModToolsPanel.html  |  7 +++++--
 views/includes/scriptUserToolsPanel.html | 22 +++++++++++-----------
 views/includes/userModToolsPanel.html    |  6 +++---
 views/includes/userPageHeader.html       |  4 +++-
 views/includes/userUserToolsPanel.html   |  2 +-
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/views/includes/scriptModToolsPanel.html b/views/includes/scriptModToolsPanel.html
index ab6a2ffc5..881488740 100644
--- a/views/includes/scriptModToolsPanel.html
+++ b/views/includes/scriptModToolsPanel.html
@@ -1,14 +1,17 @@
 {{#modTools}}
 <div class="panel panel-default">
   <div class="panel-heading">
-    <div class="panel-title">Mod Tools</div>
+    <div class="panel-title">
+      <i class="fa fa-fw fa-eye"></i>
+      Mod Tools
+    </div>
   </div>
   <div class="panel-body">
     {{#script}}
     {{> includes/flagModelSnippet.html }}
     {{/script}}
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{script.scriptRemovePageUrl}}}" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-trash-o"></i> Remove Script</a></a></li>
+      <li><a href="{{{script.scriptRemovePageUrl}}}" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-trash-o"></i> Remove Script</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/includes/scriptUserToolsPanel.html b/views/includes/scriptUserToolsPanel.html
index b7d8e4751..4543b4c09 100644
--- a/views/includes/scriptUserToolsPanel.html
+++ b/views/includes/scriptUserToolsPanel.html
@@ -1,20 +1,20 @@
 <div class="panel panel-default">
   <div class="panel-body">
     <div class="row">
-        <div class="pull-left vote-area">
-          <a href="{{^votedUp}}{{{voteUpUrl}}}{{/votedUp}}{{#votedUp}}{{{unvoteUrl}}}{{/votedUp}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedUp}}active{{/votedUp}}"><i class="fa fa-2x fa-caret-up"></i></a>
-          <a href="{{^votedDown}}{{{voteDownUrl}}}{{/votedDown}}{{#votedDown}}{{{unvoteUrl}}}{{/votedDown}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedDown}}active{{/votedDown}}"><i class="fa fa-2x fa-caret-down"></i></a>
-        </div>
-        <p><i class="fa fa-fw fa-signal"></i> <b>Rating:</b> {{script.rating}}</p>
-        <div class="progress">
-          <div style="width: {{script.votesPercent}}%" class="progress-bar progress-bar-good">{{#script.votes}}{{script.votes}} Votes{{/script.votes}}</div>
-          <div style="width: {{script.flagsPercent}}%" class="progress-bar progress-bar-danger">{{#script.flags}}{{script.flags}} <i class="fa fa-fw fa-flag"></i>{{/script.flags}}</div>
-        </div>
+      <div class="pull-left vote-area">
+        <a href="{{^votedUp}}{{{voteUpUrl}}}{{/votedUp}}{{#votedUp}}{{{unvoteUrl}}}{{/votedUp}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedUp}}active{{/votedUp}}"><i class="fa fa-2x fa-caret-up"></i></a>
+        <a href="{{^votedDown}}{{{voteDownUrl}}}{{/votedDown}}{{#votedDown}}{{{unvoteUrl}}}{{/votedDown}}" class="btn-vote {{^voteable}}disabled{{/voteable}} {{#votedDown}}active{{/votedDown}}"><i class="fa fa-2x fa-caret-down"></i></a>
+      </div>
+      <p><i class="fa fa-fw fa-signal"></i> <b>Rating:</b> {{script.rating}}</p>
+      <div class="progress">
+        <div style="width: {{script.votesPercent}}%" class="progress-bar progress-bar-good">{{#script.votes}}{{script.votes}} Votes{{/script.votes}}</div>
+        <div style="width: {{script.flagsPercent}}%" class="progress-bar progress-bar-danger">{{#script.flags}}{{script.flags}} <i class="fa fa-fw fa-flag"></i>{{/script.flags}}</div>
+      </div>
     </div>
     <ul class="nav nav-pills nav-justified">
       <li><a href="{{{favouriteUrl}}}" class="{{^canFavourite}}disabled{{/canFavourite}}"><i class="fa fa-star{{^upvoted}}-o{{/upvoted}}"></i> Favourite</a></li>
-      <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></a></li>
-      <li><a href="{{forkUrl}}" class="{{^canFork}}disabled{{/canFork}}"><i class="fa fa-code-fork"></i> Fork</a></a></li>
+      <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></li>
+      <li><a href="{{forkUrl}}" class="{{^canFork}}disabled{{/canFork}}"><i class="fa fa-code-fork"></i> Fork</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/includes/userModToolsPanel.html b/views/includes/userModToolsPanel.html
index 08fed1e16..b938457c2 100644
--- a/views/includes/userModToolsPanel.html
+++ b/views/includes/userModToolsPanel.html
@@ -2,8 +2,8 @@
 <div class="panel panel-default">
   <div class="panel-heading">
     <div class="panel-title">
-        <i class="fa fa-fw fa-eye"></i>
-        Mod Tools
+      <i class="fa fa-fw fa-eye"></i>
+      Mod Tools
     </div>
   </div>
   <div class="panel-body">
@@ -11,7 +11,7 @@
     {{> includes/flagModelSnippet.html }}
     {{/user}}
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{user.userRemovePageUrl}}}" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-trash-o"></i> Remove User</a></a></li>
+      <li><a href="{{{user.userRemovePageUrl}}}" class="{{^canRemove}}disabled{{/canRemove}}"><i class="fa fa-trash-o"></i> Remove User</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/includes/userPageHeader.html b/views/includes/userPageHeader.html
index 58b8df1e7..36b306e13 100644
--- a/views/includes/userPageHeader.html
+++ b/views/includes/userPageHeader.html
@@ -1,5 +1,7 @@
 <h2 class="page-heading">
-  <span class="page-heading-icon"><i class="fa fa-user"></i></span> <a href="{{{user.userPageUrl}}}" class="user-name">{{user.name}}</a>{{#user.roleName}} <div class=" label label-inverse">{{user.roleName}}</div>{{/user.roleName}}
+  <span class="page-heading-icon"><i class="fa fa-user"></i></span>
+  <a href="{{{user.userPageUrl}}}" class="user-name">{{user.name}}</a>
+  {{#user.roleName}}<span class="label label-inverse">{{user.roleName}}</span>{{/user.roleName}}
 </h2>
 
 <nav class="navbar navbar-default navbar-static-top" role="navigation">
diff --git a/views/includes/userUserToolsPanel.html b/views/includes/userUserToolsPanel.html
index 0b9b12722..9908797e8 100644
--- a/views/includes/userUserToolsPanel.html
+++ b/views/includes/userUserToolsPanel.html
@@ -1,7 +1,7 @@
 <div class="panel panel-default">
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></a></li>
+      <li><a href="{{{flagUrl}}}" class="{{^canFlag}}disabled{{/canFlag}}"><i class="fa fa-flag{{^flagged}}-o{{/flagged}}"></i> {{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}</a></li>
     </ul>
   </div>
 </div>

From ae9e682d71720e8aacd26ee8f509ff2cfe9becf9 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Sun, 15 Jun 2014 22:59:11 +0200
Subject: [PATCH 03/14] * Valid HTML; * Removed unneeded mustache if;

---
 views/includes/discussionList.html | 98 +++++++++++++++---------------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/views/includes/discussionList.html b/views/includes/discussionList.html
index c84c534c9..db83b6321 100644
--- a/views/includes/discussionList.html
+++ b/views/includes/discussionList.html
@@ -1,50 +1,52 @@
 <div class="table-responsive">
-<table class="table table-hover table-condensed table-striped">
-  <thead>
-    <tr>
-      <th class="text-center"><a href="?orderBy=topic&orderDir=asc">Topic</a></th>
-      {{#multipleCategories}}
-      <th class="text-center td-fit">Category</th>
-      {{/multipleCategories}}
-      <th class="text-center td-fit">Users</th>
-      <th class="text-center td-fit"><a href="?orderBy=comments&orderDir=desc">Posts</a></th>
-      <th class="text-center td-fit">Views</th>
-      <th class="text-center td-fit"><a href="?orderBy=created&orderDir=desc">Created</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=updated&orderDir=desc">Updated</a></th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#discussionList}}
-    <tr class="tr-link">
-      <td>
-        <b>
-          <a href="{{{discussionPageUrl}}}" class="tr-link-a">{{topic}}</a>
-        </b>
-      </td>
-      {{#multipleCategories}}
-      <td class="td-fit">
-        <span class="label label-default"><a {{#category.categoryPageUrl}}href="{{{category.categoryPageUrl}}}"{{/category.categoryPageUrl}}>{{category.name}}</a></span>
-      </td>
-      {{/multipleCategories}}
-      <td class="td-fit">
-      {{#recentCommentors}}
-        <span class="label label-info">{{name}}</span>
-      {{/recentCommentors}}
-      </td>
-      <td class="text-center td-fit">
-        <p>{{comments}}</p>
-      </td>
-      <td class="text-center td-fit">
-        <p>?</p>
-      </td>
-      <td class="text-center td-fit">
-        <time datetime="{{createdISOFormat}}" title="{{created}}">{{createdHumanized}}</time>
-      </td>
-      <td class="text-center td-fit">
-        <time datetime="{{updatedISOFormat}}" title="{{updated}}">{{updatedHumanized}}</time>
-      </td>
-    </tr>
-    {{/discussionList}}
-  </tbody>
-</table>
+  <table class="table table-hover table-condensed table-striped">
+    <thead>
+      <tr>
+        <th class="text-center"><a href="?orderBy=topic&amp;orderDir=asc">Topic</a></th>
+        {{#multipleCategories}}
+        <th class="text-center td-fit">Category</th>
+        {{/multipleCategories}}
+        <th class="text-center td-fit">Users</th>
+        <th class="text-center td-fit"><a href="?orderBy=comments&amp;orderDir=desc">Posts</a></th>
+        <th class="text-center td-fit">Views</th>
+        <th class="text-center td-fit"><a href="?orderBy=created&amp;orderDir=desc">Created</a></th>
+        <th class="text-center td-fit"><a href="?orderBy=updated&amp;orderDir=desc">Updated</a></th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#discussionList}}
+      <tr class="tr-link">
+        <td>
+          <b>
+            <a href="{{{discussionPageUrl}}}" class="tr-link-a">{{topic}}</a>
+          </b>
+        </td>
+        {{#multipleCategories}}
+        <td class="td-fit">
+          <span class="label label-default">
+            <a href="{{{category.categoryPageUrl}}}">{{category.name}}</a>
+          </span>
+        </td>
+        {{/multipleCategories}}
+        <td class="td-fit">
+          {{#recentCommentors}}
+          <span class="label label-info">{{name}}</span>
+          {{/recentCommentors}}
+        </td>
+        <td class="text-center td-fit">
+          <p>{{comments}}</p>
+        </td>
+        <td class="text-center td-fit">
+          <p>?</p>
+        </td>
+        <td class="text-center td-fit">
+          <time datetime="{{createdISOFormat}}" title="{{created}}">{{createdHumanized}}</time>
+        </td>
+        <td class="text-center td-fit">
+          <time datetime="{{updatedISOFormat}}" title="{{updated}}">{{updatedHumanized}}</time>
+        </td>
+      </tr>
+      {{/discussionList}}
+    </tbody>
+  </table>
 </div>

From 8ee7f9ff9d6a59dfd34bfb901b641001b2547cb4 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Sun, 15 Jun 2014 23:11:30 +0200
Subject: [PATCH 04/14] * Used HTML entity for copyright symbol;

---
 views/includes/footer.html | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/views/includes/footer.html b/views/includes/footer.html
index dc4f2372d..a1f68923a 100644
--- a/views/includes/footer.html
+++ b/views/includes/footer.html
@@ -1,24 +1,24 @@
-  <footer id="footer">
-    <nav role="navigation" class="navbar navbar-inverse navbar-static-top">
-      <div class="container-fluid">
-        <div class="navbar-header">
-          <button type="button" data-toggle="collapse" data-target=".navbar-collapse-bottom" class="navbar-toggle" onclick="$('html, body').animate({scrollTop: $(document).height()}, 'slow')"><i class="fa fa-bars"></i></button><a href="https://github.com/OpenUserJs" class="navbar-brand">© 2014 OpenUserJS Group</a>
-        </div>
-        <div class="navbar-collapse navbar-collapse-bottom collapse">
-          <ul class="nav navbar-nav navbar-right">
-            <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/wiki/_pages">About</a></li>
-            <li><a href="https://github.com/orgs/OpenUserJs/members">Collaborators</a></li>
-            <li><a href="https://github.com/OpenUserJs/OpenUserJS.org">Join Us On GitHub</a></li>
-            <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/blob/master/TOS.md">TOS</a></li>
-            <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/blob/master/DMCA.md">DMCA</a></li>
-            <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/blob/master/PRIVACY.md">PRIVACY</a></li>
-          </ul>
-        </div>
+<footer id="footer">
+  <nav role="navigation" class="navbar navbar-inverse navbar-static-top">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <button type="button" data-toggle="collapse" data-target=".navbar-collapse-bottom" class="navbar-toggle" onclick="$('html, body').animate({scrollTop: $(document).height()}, 'slow')"><i class="fa fa-bars"></i></button>
+        <a href="https://github.com/OpenUserJs" class="navbar-brand">&copy; 2014 OpenUserJS Group</a>
       </div>
-    </nav>
-  </footer>
-
+      <div class="navbar-collapse navbar-collapse-bottom collapse">
+        <ul class="nav navbar-nav navbar-right">
+          <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/wiki/_pages">About</a></li>
+          <li><a href="https://github.com/orgs/OpenUserJs/members">Collaborators</a></li>
+          <li><a href="https://github.com/OpenUserJs/OpenUserJS.org">Join Us On GitHub</a></li>
+          <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/blob/master/TOS.md" title="Terms of Service">TOS</a></li>
+          <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/blob/master/DMCA.md" title="Digital Millennium Copyright Act">DMCA</a></li>
+          <li><a href="https://github.com/OpenUserJs/OpenUserJS.org/blob/master/PRIVACY.md">Privacy</a></li>
+        </ul>
+      </div>
+    </div>
+  </nav>
+</footer>
 
-  <!-- JS -->
-  <script type="text/javascript" charset="utf-8" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-  <script type="text/javascript" charset="utf-8" defer src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>
+<!-- JS -->
+<script type="text/javascript" charset="utf-8" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+<script type="text/javascript" charset="utf-8" defer src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>

From e04b37413bc8eb7132ed750aec048328c5847470 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Sun, 15 Jun 2014 23:43:38 +0200
Subject: [PATCH 05/14] * Valid HTML; * Consistency;

---
 views/includes/commentForm.html            |  1 -
 views/includes/groupList.html              |  4 +-
 views/includes/header.html                 | 56 ++++++++++++----------
 views/includes/popularGroupsPanel.html     |  2 +-
 views/includes/removedItemList.html        | 10 ++--
 views/includes/scriptAuthorToolsPanel.html |  4 +-
 views/includes/scriptPageHeader.html       | 13 +++--
 views/includes/searchBar.html              |  2 +-
 views/includes/searchBarPanel.html         |  2 +-
 views/includes/siteStatsPanel.html         |  2 +-
 views/includes/userList.html               |  6 +--
 views/includes/userPageHeader.html         |  2 +-
 views/includes/userToolsPanel.html         |  6 +--
 views/pages/discussionListPage.html        |  2 +-
 views/pages/discussionPage.html            |  4 +-
 views/pages/newDiscussionPage.html         |  4 +-
 views/pages/scriptIssueListPage.html       |  2 +-
 views/pages/scriptIssuePage.html           |  4 +-
 views/pages/scriptNewIssuePage.html        |  6 +--
 views/pages/userGitHubRepoListPage.html    |  2 +-
 views/pages/userGitHubRepoPage.html        |  2 +-
 21 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/views/includes/commentForm.html b/views/includes/commentForm.html
index c310237f5..a9e663a1e 100644
--- a/views/includes/commentForm.html
+++ b/views/includes/commentForm.html
@@ -1,7 +1,6 @@
 <div id="reply-control" class="collapse">
   <form action="{{{discussion.discussionPageUrl}}}" method="post">
     <div class="container-fluid row user-content">
-
       <div class="submit-panel pull-right btn-toolbar">
         <button class="btn btn-sm btn-success" type="submit">Reply</button>
         <button class="btn btn-sm btn-danger" type="button" data-toggle="collapse" data-target="#reply-control">Cancel</button>
diff --git a/views/includes/groupList.html b/views/includes/groupList.html
index 2147d1017..d71825249 100644
--- a/views/includes/groupList.html
+++ b/views/includes/groupList.html
@@ -1,9 +1,9 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class=""><a href="?orderBy=name&orderDir=asc">Name</a></th>
+      <th><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
       <th class="text-center">Size</th>
-      <th class="text-center"><a href="?orderBy=rating&orderDir=desc">Rating</a></th>
+      <th class="text-center"><a href="?orderBy=rating&amp;orderDir=desc">Rating</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/header.html b/views/includes/header.html
index ca1e0b2df..486e63593 100644
--- a/views/includes/header.html
+++ b/views/includes/header.html
@@ -1,27 +1,31 @@
-  <nav role="navigation" class="navbar navbar-default navbar-static-top">
-    <div class="container-fluid">
-      <div class="navbar-header">
-        <button type="button" data-toggle="collapse" data-target=".navbar-collapse-top" class="navbar-toggle"><i class="fa fa-bars"></i></button>
-        <a href="/" class="navbar-brand">OpenUserJS</a>
-      </div>
-      <div class="navbar-collapse navbar-collapse-top collapse">
-        <ul class="nav navbar-nav navbar-right">
-          <li><a href="/">Scripts</a></li>
-          <li><a href="/?library=true">Libs</a></li>
-          <li><a href="/groups">Groups</a></li>
-          <li><a href="/forum">Discuss</a></li>
-          <li><a href="/users">Users</a></li>
-          {{#authedUser}}
-          {{#authedUser.isMod}}<li><a href="/mod" class=""><i class="fa fa-eye"></i><span class="visible-xs"> Moderation</span></a></li>{{/authedUser.isMod}}
-          {{#authedUser.isAdmin}}<li><a href="/admin" class=""><i class="fa fa-coffee"></i><span class="visible-xs"> Admin</span></a></li>{{/authedUser.isAdmin}}
-          <li><a href="#" class="disabled"><i class="fa fa-envelope-o"></i> 0<span class="visible-xs"> Unread Messages</span></a></li>
-          <li><a href="{{authedUser.userPageUrl}}">{{authedUser.name}}</a></li>
-          <li><a href="/logout"><span class="visible-xs">Logout</span><i class="fa fa-sign-out"></i></a></li>
-          {{/authedUser}}
-          {{^authedUser}}
-          <li><a href="/register">Login / Sign Up <i class="fa fa-sign-in"></i></a></li>
-          {{/authedUser}}
-        </ul>
-      </div>
+<nav role="navigation" class="navbar navbar-default navbar-static-top">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" data-toggle="collapse" data-target=".navbar-collapse-top" class="navbar-toggle"><i class="fa fa-bars"></i></button>
+      <a href="/" class="navbar-brand">OpenUserJS</a>
     </div>
-  </nav>
+    <div class="navbar-collapse navbar-collapse-top collapse">
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="/">Scripts</a></li>
+        <li><a href="/?library=true">Libs</a></li>
+        <li><a href="/groups">Groups</a></li>
+        <li><a href="/forum">Discuss</a></li>
+        <li><a href="/users">Users</a></li>
+        {{#authedUser}}
+        {{#authedUser.isMod}}
+        <li><a href="/mod"><i class="fa fa-eye"></i><span class="visible-xs"> Moderation</span></a></li>
+        {{/authedUser.isMod}}
+        {{#authedUser.isAdmin}}
+        <li><a href="/admin"><i class="fa fa-coffee"></i><span class="visible-xs"> Admin</span></a></li>
+        {{/authedUser.isAdmin}}
+        <li><a href="#" class="disabled"><i class="fa fa-envelope-o"></i> 0<span class="visible-xs"> Unread Messages</span></a></li>
+        <li><a href="{{authedUser.userPageUrl}}">{{authedUser.name}}</a></li>
+        <li><a href="/logout"><span class="visible-xs">Logout</span><i class="fa fa-sign-out"></i></a></li>
+        {{/authedUser}}
+        {{^authedUser}}
+        <li><a href="/register">Login / Sign Up <i class="fa fa-sign-in"></i></a></li>
+        {{/authedUser}}
+      </ul>
+    </div>
+  </div>
+</nav>
diff --git a/views/includes/popularGroupsPanel.html b/views/includes/popularGroupsPanel.html
index 1b873da87..9b89a731d 100644
--- a/views/includes/popularGroupsPanel.html
+++ b/views/includes/popularGroupsPanel.html
@@ -5,7 +5,7 @@
   <div class="panel-body">
     <ul class="tagcloud">
       {{#popularGroupList}}
-        <li><a href="{{{groupPageUrl}}}">{{name}}</a> <span class="badge">{{size}}</span></li>
+      <li><a href="{{{groupPageUrl}}}">{{name}}</a> <span class="badge">{{size}}</span></li>
       {{/popularGroupList}}
     </ul>
   </div>
diff --git a/views/includes/removedItemList.html b/views/includes/removedItemList.html
index 396c1d633..244df0356 100644
--- a/views/includes/removedItemList.html
+++ b/views/includes/removedItemList.html
@@ -1,11 +1,11 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class="text-center td-fit"><a href="?orderBy=model&orderDir=asc">Type</a></th>
-      <th class="">Item</th>
-      <th class="">Reason</th>
-      <th class="text-center td-fit"><a href="?orderBy=remover&orderDir=asc">Removed By</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=removed&orderDir=desc">Date</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=model&amp;orderDir=asc">Type</a></th>
+      <th>Item</th>
+      <th>Reason</th>
+      <th class="text-center td-fit"><a href="?orderBy=remover&amp;orderDir=asc">Removed By</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=removed&amp;orderDir=desc">Date</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/scriptAuthorToolsPanel.html b/views/includes/scriptAuthorToolsPanel.html
index 8c42bb8a2..41dd52444 100644
--- a/views/includes/scriptAuthorToolsPanel.html
+++ b/views/includes/scriptAuthorToolsPanel.html
@@ -5,8 +5,8 @@
   </div>
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{script.scriptEditMetadataPageUrl}}}" class=""><i class="fa fa-edit"></i> Edit Script Info</a></li>
-      <li><a href="{{{script.scriptEditSourcePageUrl}}}" class=""><i class="fa fa-file-text"></i> Edit Script</a></li>
+      <li><a href="{{{script.scriptEditMetadataPageUrl}}}"><i class="fa fa-edit"></i> Edit Script Info</a></li>
+      <li><a href="{{{script.scriptEditSourcePageUrl}}}"><i class="fa fa-file-text"></i> Edit Script</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/includes/scriptPageHeader.html b/views/includes/scriptPageHeader.html
index f44c1db69..e8ac5145a 100644
--- a/views/includes/scriptPageHeader.html
+++ b/views/includes/scriptPageHeader.html
@@ -1,13 +1,18 @@
 <h2 class="page-heading">
   <a href="{{{script.scriptInstallPageUrl}}}" class="pull-right">
     {{#script.isLib}}
-      <button class="btn btn-info"><i class="fa fa-file-text-o"></i> Raw Source</button>
+    <button class="btn btn-info"><i class="fa fa-file-text-o"></i> Raw Source</button>
     {{/script.isLib}}
     {{^script.isLib}}
-      <button class="btn btn-info"><i class="fa fa-download"></i> Install</button>
+    <button class="btn btn-info"><i class="fa fa-download"></i> Install</button>
     {{/script.isLib}}
   </a>
-  {{#script.icon45Url}}<span class="page-heading-icon"><img src="{{{script.icon45Url}}}" alt="" /></span> {{/script.icon45Url}} <a href="{{{script.author.userPageUrl}}}" class="script-author">{{script.author.name}}</a><span class="path-divider">/</span><a href="{{{script.scriptPageUrl}}}" class="script-name">{{script.name}}</a>
+  {{#script.icon45Url}}
+  <span class="page-heading-icon"><img src="{{{script.icon45Url}}}" alt="" /></span>
+  {{/script.icon45Url}}
+  <a href="{{{script.author.userPageUrl}}}" class="script-author">{{script.author.name}}</a>
+  <span class="path-divider">/</span>
+  <a href="{{{script.scriptPageUrl}}}" class="script-name">{{script.name}}</a>
 </h2>
 <nav class="navbar navbar-default navbar-static-top" role="navigation">
   <div class="navbar-header">
@@ -17,7 +22,7 @@ <h2 class="page-heading">
   </div>
   <div class="navbar-collapse collapse in" id="content-navbar">
     <ul class="nav navbar-nav">
-      <li class="{{#isScriptPage}}active{{/isScriptPage}}"><a href="{{{script.scriptPageUrl}}}" class="">About</a></li>
+      <li class="{{#isScriptPage}}active{{/isScriptPage}}"><a href="{{{script.scriptPageUrl}}}">About</a></li>
       <li class="{{#isScriptViewSourcePage}}active{{/isScriptViewSourcePage}}"><a href="{{{script.scriptViewSourcePageUrl}}}" class="{{^script.scriptViewSourcePageUrl}}disabled{{/script.scriptViewSourcePageUrl}}">Source Code</a></li>
       <li class="{{#isScriptIssuesPage}}active{{/isScriptIssuesPage}}"><a href="{{{script.scriptIssuesPageUrl}}}" class="{{^script.scriptIssuesPageUrl}}disabled{{/script.scriptIssuesPageUrl}}">Issues <span class="badge">{{issueCount}}</span></a></li>
     </ul>
diff --git a/views/includes/searchBar.html b/views/includes/searchBar.html
index be7602c69..ab219c6a3 100644
--- a/views/includes/searchBar.html
+++ b/views/includes/searchBar.html
@@ -1,6 +1,6 @@
 <form action="{{{searchBarFormAction}}}" method="get">
   {{#searchBarFormHiddenVariables}}
-    <input type="hidden" name="{{name}}" value="{{value}}">
+  <input type="hidden" name="{{name}}" value="{{value}}">
   {{/searchBarFormHiddenVariables}}
   <div class="input-group col-xs-12">
     <input name="q" type="text" placeholder="{{searchBarPlaceholder}}" class="search form-control" value="{{searchBarValue}}" />
diff --git a/views/includes/searchBarPanel.html b/views/includes/searchBarPanel.html
index c497e018c..a8266d33b 100644
--- a/views/includes/searchBarPanel.html
+++ b/views/includes/searchBarPanel.html
@@ -1,5 +1,5 @@
 <div class="panel panel-transparent">
-  <div class="input-group col-xs-12 ">
+  <div class="input-group col-xs-12">
     {{> includes/searchBar.html }}
   </div>
 </div>
diff --git a/views/includes/siteStatsPanel.html b/views/includes/siteStatsPanel.html
index d0d6665fb..97f85be80 100644
--- a/views/includes/siteStatsPanel.html
+++ b/views/includes/siteStatsPanel.html
@@ -12,4 +12,4 @@
       <div class="col-xs-8">{{totalGroups}}</div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/includes/userList.html b/views/includes/userList.html
index a4fa48787..bca78c140 100644
--- a/views/includes/userList.html
+++ b/views/includes/userList.html
@@ -1,8 +1,8 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class=""><a href="?orderBy=name&orderDir=asc">Name</a></th>
-      <th class=""><a href="?orderBy=role&orderDir=asc">Rank</a></th>
+      <th><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
+      <th><a href="?orderBy=role&amp;orderDir=asc">Rank</a></th>
     </tr>
   </thead>
   <tbody>
@@ -13,7 +13,7 @@
           <a href="{{{userPageUrl}}}" class="tr-link-a">{{name}}</a>
         </b>
       </td>
-      <td class="">
+      <td>
         <p>
           <span class="label label-default">{{roleName}}</span>
         </p>
diff --git a/views/includes/userPageHeader.html b/views/includes/userPageHeader.html
index 36b306e13..851a5050f 100644
--- a/views/includes/userPageHeader.html
+++ b/views/includes/userPageHeader.html
@@ -10,7 +10,7 @@ <h2 class="page-heading">
   </div>
   <div class="navbar-collapse collapse in" id="content-navbar">
     <ul class="nav navbar-nav">
-      <li class="{{#isUserPage}}active{{/isUserPage}}"><a href="{{{user.userPageUrl}}}" class="">Profile</a></li>
+      <li class="{{#isUserPage}}active{{/isUserPage}}"><a href="{{{user.userPageUrl}}}">Profile</a></li>
       <li class="{{#isUserScriptListPage}}active{{/isUserScriptListPage}}"><a href="{{{user.userScriptListPageUrl}}}" class="{{^user.userScriptListPageUrl}}disabled{{/user.userScriptListPageUrl}}">Scripts <span class="badge">{{scriptListCount}}</span></a></li>
       <li class="{{#isUserCommentListPage}}active{{/isUserCommentListPage}}"><a href="{{{user.userCommentListPageUrl}}}" class="{{^user.userCommentListPageUrl}}disabled{{/user.userCommentListPageUrl}}">Comments <span class="badge">{{commentListCount}}</span></a></li>
     </ul>
diff --git a/views/includes/userToolsPanel.html b/views/includes/userToolsPanel.html
index cd2de8b0a..c1d989de4 100644
--- a/views/includes/userToolsPanel.html
+++ b/views/includes/userToolsPanel.html
@@ -3,11 +3,11 @@
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
       <li><a href="{{{user.userEditProfilePageUrl}}}" class="{{^user.userEditProfilePageUrl}}disabled{{/user.userEditProfilePageUrl}}"><i class="fa fa-user"></i> Edit Profile</a></li>
-      <li><a href="/user/preferences" class=""><i class="fa fa-cogs"></i> Preferences</a></li>
+      <li><a href="/user/preferences"><i class="fa fa-cogs"></i> Preferences</a></li>
     </ul>
     <ul class="nav nav-pills nav-justified">
-      <li><a href="/user/add/scripts" class=""><i class="fa fa-file-code-o"></i> Add Script</a></li>
-      <li><a href="/user/add/lib" class=""><i class="fa fa-folder-open-o"></i> Add Library</a></li>
+      <li><a href="/user/add/scripts"><i class="fa fa-file-code-o"></i> Add Script</a></li>
+      <li><a href="/user/add/lib"><i class="fa fa-folder-open-o"></i> Add Library</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/pages/discussionListPage.html b/views/pages/discussionListPage.html
index e579eca5a..9750ee619 100644
--- a/views/pages/discussionListPage.html
+++ b/views/pages/discussionListPage.html
@@ -11,7 +11,7 @@
       <div class="col-sm-12">
         <div class="list-controls row container-fluid">
           <ol class="breadcrumb pull-left">
-            <li class=""><a href="/forum">Forum</a></li>
+            <li><a href="/forum">Forum</a></li>
             <li class="active"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
           </ol>
           <a href="{{{category.categoryPostDiscussionPageUrl}}}" class="btn btn-success pull-right" id="create-topic">
diff --git a/views/pages/discussionPage.html b/views/pages/discussionPage.html
index cf2abfb85..8d7bf12aa 100644
--- a/views/pages/discussionPage.html
+++ b/views/pages/discussionPage.html
@@ -17,8 +17,8 @@
           <div class="col-xs-12">
             <div class="topic-title row container-fluid">
               <ol class="breadcrumb pull-left">
-                <li class=""><a href="/forum">Forum</a></li>
-                <li class=""><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+                <li><a href="/forum">Forum</a></li>
+                <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
                 <li class="active"><a href="{{{discussion.discussionPageUrl}}}">{{discussion.topic}}</a></li>
               </ol>
             </div>
diff --git a/views/pages/newDiscussionPage.html b/views/pages/newDiscussionPage.html
index 5bf2c07a6..bff7b4ba9 100644
--- a/views/pages/newDiscussionPage.html
+++ b/views/pages/newDiscussionPage.html
@@ -15,10 +15,10 @@
             <div class="col-xs-12">
               <div class="topic-title row container-fluid">
                 <ol class="breadcrumb col-xs-12">
-                  <li class=""><a href="/forum">Forum</a></li>
+                  <li><a href="/forum">Forum</a></li>
                   <li class="col-xs-12"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
                   <li class="col-xs-12">
-                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" class="" placeholder="Topic" required>
+                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" placeholder="Topic" required>
                   </li>
                 </ol>
               </div>
diff --git a/views/pages/scriptIssueListPage.html b/views/pages/scriptIssueListPage.html
index 6651c34dc..195ef1e7a 100644
--- a/views/pages/scriptIssueListPage.html
+++ b/views/pages/scriptIssueListPage.html
@@ -13,7 +13,7 @@
         {{> includes/scriptPageHeader.html }}
         <div class="list-controls row container-fluid">
           <ol class="breadcrumb pull-left">
-            <li class=""><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
+            <li><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
             <li class="active"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
           </ol>
           <div class="input-group pull-left col-sm-1">
diff --git a/views/pages/scriptIssuePage.html b/views/pages/scriptIssuePage.html
index 4b83b93bc..92a14d14f 100644
--- a/views/pages/scriptIssuePage.html
+++ b/views/pages/scriptIssuePage.html
@@ -18,8 +18,8 @@
         <div class="col-xs-12">
           <div class="topic-title row container-fluid">
             <ol class="breadcrumb pull-left">
-              <li class=""><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
-              <li class=""><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+              <li><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
+              <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
               <li class="active"><a href="{{{discussion.discussionPageUrl}}}">{{discussion.topic}}</a></li>
             </ol>
             <div class="pull-right">
diff --git a/views/pages/scriptNewIssuePage.html b/views/pages/scriptNewIssuePage.html
index 2d5ba9343..22eb6712f 100644
--- a/views/pages/scriptNewIssuePage.html
+++ b/views/pages/scriptNewIssuePage.html
@@ -15,10 +15,10 @@
             <div class="col-xs-12">
               <div class="topic-title row container-fluid">
                 <ol class="breadcrumb col-xs-12">
-                  <li class=""><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
-                  <li class=""><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+                  <li><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
+                  <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
                   <li class="col-xs-12">
-                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" class="" placeholder="Topic" required>
+                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" placeholder="Topic" required>
                   </li>
                 </ol>
               </div>
diff --git a/views/pages/userGitHubRepoListPage.html b/views/pages/userGitHubRepoListPage.html
index 2b8195a3e..a805225e4 100644
--- a/views/pages/userGitHubRepoListPage.html
+++ b/views/pages/userGitHubRepoListPage.html
@@ -10,7 +10,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8">
-        <h2 class=""><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{githubUser.login}}</a></h2>
+        <h2><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{githubUser.login}}</a></h2>
         <div class="list-group">
         {{#githubRepoList}}
           <a href="{{{userGitHubRepoPageUrl}}}" class="list-group-item">
diff --git a/views/pages/userGitHubRepoPage.html b/views/pages/userGitHubRepoPage.html
index 4d34da05a..4c6a8070c 100644
--- a/views/pages/userGitHubRepoPage.html
+++ b/views/pages/userGitHubRepoPage.html
@@ -10,7 +10,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8">
-        <h2 class=""><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{repo.owner.login}}</a><span class="path-divider">/</span><a href="{{{userGitHubRepoPageUrl}}}" class="script-name">{{repo.name}}</a></h2>
+        <h2><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{repo.owner.login}}</a><span class="path-divider">/</span><a href="{{{userGitHubRepoPageUrl}}}" class="script-name">{{repo.name}}</a></h2>
 
         <div class="panel panel-default">
           <div class="panel-body">

From 4d41e88df4b0c480bc89d40426b49a7920658e71 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Mon, 16 Jun 2014 00:02:51 +0200
Subject: [PATCH 06/14] * Valid HTML; * Consistency;

---
 views/pages/_templatePage.html       | 2 +-
 views/pages/adminApiKeysPage.html    | 9 ++++-----
 views/pages/categoryListPage.html    | 5 ++---
 views/pages/discussionListPage.html  | 1 -
 views/pages/discussionPage.html      | 7 +++----
 views/pages/groupListPage.html       | 1 -
 views/pages/groupScriptListPage.html | 1 -
 views/pages/modPage.html             | 2 +-
 views/pages/newDiscussionPage.html   | 7 ++-----
 9 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/views/pages/_templatePage.html b/views/pages/_templatePage.html
index 2411031c1..a70f6e8ea 100644
--- a/views/pages/_templatePage.html
+++ b/views/pages/_templatePage.html
@@ -9,7 +9,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-xs-12">
-        
+
       </div>
     </div>
   </div>
diff --git a/views/pages/adminApiKeysPage.html b/views/pages/adminApiKeysPage.html
index 5c0c6fd26..c66b87d82 100644
--- a/views/pages/adminApiKeysPage.html
+++ b/views/pages/adminApiKeysPage.html
@@ -11,8 +11,8 @@
       <div class="col-xs-12">
         <h1>Auth Strategy API Keys</h1>
         <form class="form-horizontal" role="form" method="post" action="/admin/api/update">
-          <div class="list-group">
-          {{#strategies}}
+          <ul class="list-group">
+            {{#strategies}}
             <li class="list-group-item">
               <h4 class="list-group-item-heading">{{strat}}</h4>
               <div class="row">
@@ -28,11 +28,10 @@ <h4 class="list-group-item-heading">{{strat}}</h4>
                     <input type="text" class="form-control" name="{{{strat}}}[1]" value="{{{key}}}" placeholder="Key">
                   </div>
                 </div>
-
               </div>
             </li>
-          {{/strategies}}
-          </div>
+            {{/strategies}}
+          </ul>
           <div class="container-fluid row">
             <button type="submit" class="btn btn-success col-sm-12">Update</button>
           </div>
diff --git a/views/pages/categoryListPage.html b/views/pages/categoryListPage.html
index 3c010c12f..c006f3b87 100644
--- a/views/pages/categoryListPage.html
+++ b/views/pages/categoryListPage.html
@@ -13,12 +13,12 @@ <h2 class="page-heading">
           Discuss
         </h2>
         <div class="list-group">
-        {{#categoryList}}
+          {{#categoryList}}
           <a href="{{{categoryPageUrl}}}" class="list-group-item">
             <h4 class="list-group-item-heading">{{name}}</h4>
             <p class="list-group-item-text">{{description}}</p>
           </a>
-        {{/categoryList}}
+          {{/categoryList}}
         </div>
         <div class="panel panel-default">
           {{> includes/discussionList.html }}
@@ -26,7 +26,6 @@ <h4 class="list-group-item-heading">{{name}}</h4>
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
     </div>
   </div>
diff --git a/views/pages/discussionListPage.html b/views/pages/discussionListPage.html
index 9750ee619..11da6af2b 100644
--- a/views/pages/discussionListPage.html
+++ b/views/pages/discussionListPage.html
@@ -24,7 +24,6 @@
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
     </div>
   </div>
diff --git a/views/pages/discussionPage.html b/views/pages/discussionPage.html
index 8d7bf12aa..7995bac3f 100644
--- a/views/pages/discussionPage.html
+++ b/views/pages/discussionPage.html
@@ -5,7 +5,9 @@
   {{> includes/head.html }}
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-markdown/2.2.1/css/bootstrap-markdown.min.css">
   <style>
-    #show-reply-form-when-visible { height: 100px; }
+    #show-reply-form-when-visible {
+      height: 100px;
+    }
   </style>
 </head>
 <body>
@@ -38,14 +40,11 @@
         </div>
       </div>
       <div class="container-fluid col-sm-4">
-
       </div>
     </div>
   </div>
-
   <div id="show-reply-form-when-visible"></div>
   {{> includes/commentForm.html }}
-
   {{> includes/footer.html }}
   <!-- Markdown Editor -->
   <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js"></script>
diff --git a/views/pages/groupListPage.html b/views/pages/groupListPage.html
index 10f1f5923..122510c29 100644
--- a/views/pages/groupListPage.html
+++ b/views/pages/groupListPage.html
@@ -18,7 +18,6 @@ <h2 class="page-heading">
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
       <div class="col-sm-4">
         {{> includes/searchBarPanel.html }}
diff --git a/views/pages/groupScriptListPage.html b/views/pages/groupScriptListPage.html
index 84beaa99f..350bfb2f4 100644
--- a/views/pages/groupScriptListPage.html
+++ b/views/pages/groupScriptListPage.html
@@ -18,7 +18,6 @@ <h2 class="page-heading">
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
       <div class="col-sm-4">
         {{> includes/searchBarPanel.html }}
diff --git a/views/pages/modPage.html b/views/pages/modPage.html
index 35226f6b9..36aac35cc 100644
--- a/views/pages/modPage.html
+++ b/views/pages/modPage.html
@@ -15,7 +15,7 @@ <h3>Flagged Items</h3>
           <a href="/?flagged=true" class="list-group-item">
             <i class="fa fa-fw fa-file-code-o"></i> <i class="fa fa-fw fa-flag"></i> Flagged Scripts
           </a>
-          <a href="/?library=true&flagged=true" class="list-group-item">
+          <a href="/?library=true&amp;flagged=true" class="list-group-item">
             <i class="fa fa-fw fa-folder-open-o"></i> <i class="fa fa-fw fa-flag"></i> Flagged Libraries
           </a>
           <a href="/users?flagged=true" class="list-group-item">
diff --git a/views/pages/newDiscussionPage.html b/views/pages/newDiscussionPage.html
index bff7b4ba9..fad7f26ba 100644
--- a/views/pages/newDiscussionPage.html
+++ b/views/pages/newDiscussionPage.html
@@ -16,10 +16,8 @@
               <div class="topic-title row container-fluid">
                 <ol class="breadcrumb col-xs-12">
                   <li><a href="/forum">Forum</a></li>
-                  <li class="col-xs-12"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
-                  <li class="col-xs-12">
-                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" placeholder="Topic" required>
-                  </li>
+                  <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+                  <li><input type="text" id="discussion-topic" name="discussion-topic" size="60" placeholder="Topic" required></li>
                 </ol>
               </div>
               <div class="container-fluid comments">
@@ -33,7 +31,6 @@
           </div>
         </div>
         <div class="container-fluid col-sm-4">
-
         </div>
       </form>
     </div>

From 2a871755d720b9c2131dd123230ee8c1d4407576 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Sun, 15 Jun 2014 23:43:38 +0200
Subject: [PATCH 07/14] * Valid HTML; * Consistency;

---
 views/includes/commentForm.html            |  1 -
 views/includes/groupList.html              |  4 +-
 views/includes/header.html                 | 56 ++++++++++++----------
 views/includes/popularGroupsPanel.html     |  2 +-
 views/includes/removedItemList.html        | 10 ++--
 views/includes/scriptAuthorToolsPanel.html |  4 +-
 views/includes/scriptPageHeader.html       | 13 +++--
 views/includes/searchBar.html              |  2 +-
 views/includes/searchBarPanel.html         |  2 +-
 views/includes/siteStatsPanel.html         |  2 +-
 views/includes/userList.html               |  6 +--
 views/includes/userPageHeader.html         |  2 +-
 views/includes/userToolsPanel.html         |  6 +--
 views/pages/_templatePage.html             |  2 +-
 views/pages/adminApiKeysPage.html          |  9 ++--
 views/pages/categoryListPage.html          |  5 +-
 views/pages/discussionListPage.html        |  3 +-
 views/pages/discussionPage.html            | 11 ++---
 views/pages/groupListPage.html             |  1 -
 views/pages/groupScriptListPage.html       |  1 -
 views/pages/modPage.html                   |  2 +-
 views/pages/newDiscussionPage.html         |  9 ++--
 views/pages/scriptIssueListPage.html       |  2 +-
 views/pages/scriptIssuePage.html           |  4 +-
 views/pages/scriptNewIssuePage.html        |  6 +--
 views/pages/userGitHubRepoListPage.html    |  2 +-
 views/pages/userGitHubRepoPage.html        |  2 +-
 27 files changed, 84 insertions(+), 85 deletions(-)

diff --git a/views/includes/commentForm.html b/views/includes/commentForm.html
index c310237f5..a9e663a1e 100644
--- a/views/includes/commentForm.html
+++ b/views/includes/commentForm.html
@@ -1,7 +1,6 @@
 <div id="reply-control" class="collapse">
   <form action="{{{discussion.discussionPageUrl}}}" method="post">
     <div class="container-fluid row user-content">
-
       <div class="submit-panel pull-right btn-toolbar">
         <button class="btn btn-sm btn-success" type="submit">Reply</button>
         <button class="btn btn-sm btn-danger" type="button" data-toggle="collapse" data-target="#reply-control">Cancel</button>
diff --git a/views/includes/groupList.html b/views/includes/groupList.html
index 2147d1017..d71825249 100644
--- a/views/includes/groupList.html
+++ b/views/includes/groupList.html
@@ -1,9 +1,9 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class=""><a href="?orderBy=name&orderDir=asc">Name</a></th>
+      <th><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
       <th class="text-center">Size</th>
-      <th class="text-center"><a href="?orderBy=rating&orderDir=desc">Rating</a></th>
+      <th class="text-center"><a href="?orderBy=rating&amp;orderDir=desc">Rating</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/header.html b/views/includes/header.html
index ca1e0b2df..486e63593 100644
--- a/views/includes/header.html
+++ b/views/includes/header.html
@@ -1,27 +1,31 @@
-  <nav role="navigation" class="navbar navbar-default navbar-static-top">
-    <div class="container-fluid">
-      <div class="navbar-header">
-        <button type="button" data-toggle="collapse" data-target=".navbar-collapse-top" class="navbar-toggle"><i class="fa fa-bars"></i></button>
-        <a href="/" class="navbar-brand">OpenUserJS</a>
-      </div>
-      <div class="navbar-collapse navbar-collapse-top collapse">
-        <ul class="nav navbar-nav navbar-right">
-          <li><a href="/">Scripts</a></li>
-          <li><a href="/?library=true">Libs</a></li>
-          <li><a href="/groups">Groups</a></li>
-          <li><a href="/forum">Discuss</a></li>
-          <li><a href="/users">Users</a></li>
-          {{#authedUser}}
-          {{#authedUser.isMod}}<li><a href="/mod" class=""><i class="fa fa-eye"></i><span class="visible-xs"> Moderation</span></a></li>{{/authedUser.isMod}}
-          {{#authedUser.isAdmin}}<li><a href="/admin" class=""><i class="fa fa-coffee"></i><span class="visible-xs"> Admin</span></a></li>{{/authedUser.isAdmin}}
-          <li><a href="#" class="disabled"><i class="fa fa-envelope-o"></i> 0<span class="visible-xs"> Unread Messages</span></a></li>
-          <li><a href="{{authedUser.userPageUrl}}">{{authedUser.name}}</a></li>
-          <li><a href="/logout"><span class="visible-xs">Logout</span><i class="fa fa-sign-out"></i></a></li>
-          {{/authedUser}}
-          {{^authedUser}}
-          <li><a href="/register">Login / Sign Up <i class="fa fa-sign-in"></i></a></li>
-          {{/authedUser}}
-        </ul>
-      </div>
+<nav role="navigation" class="navbar navbar-default navbar-static-top">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" data-toggle="collapse" data-target=".navbar-collapse-top" class="navbar-toggle"><i class="fa fa-bars"></i></button>
+      <a href="/" class="navbar-brand">OpenUserJS</a>
     </div>
-  </nav>
+    <div class="navbar-collapse navbar-collapse-top collapse">
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="/">Scripts</a></li>
+        <li><a href="/?library=true">Libs</a></li>
+        <li><a href="/groups">Groups</a></li>
+        <li><a href="/forum">Discuss</a></li>
+        <li><a href="/users">Users</a></li>
+        {{#authedUser}}
+        {{#authedUser.isMod}}
+        <li><a href="/mod"><i class="fa fa-eye"></i><span class="visible-xs"> Moderation</span></a></li>
+        {{/authedUser.isMod}}
+        {{#authedUser.isAdmin}}
+        <li><a href="/admin"><i class="fa fa-coffee"></i><span class="visible-xs"> Admin</span></a></li>
+        {{/authedUser.isAdmin}}
+        <li><a href="#" class="disabled"><i class="fa fa-envelope-o"></i> 0<span class="visible-xs"> Unread Messages</span></a></li>
+        <li><a href="{{authedUser.userPageUrl}}">{{authedUser.name}}</a></li>
+        <li><a href="/logout"><span class="visible-xs">Logout</span><i class="fa fa-sign-out"></i></a></li>
+        {{/authedUser}}
+        {{^authedUser}}
+        <li><a href="/register">Login / Sign Up <i class="fa fa-sign-in"></i></a></li>
+        {{/authedUser}}
+      </ul>
+    </div>
+  </div>
+</nav>
diff --git a/views/includes/popularGroupsPanel.html b/views/includes/popularGroupsPanel.html
index 1b873da87..9b89a731d 100644
--- a/views/includes/popularGroupsPanel.html
+++ b/views/includes/popularGroupsPanel.html
@@ -5,7 +5,7 @@
   <div class="panel-body">
     <ul class="tagcloud">
       {{#popularGroupList}}
-        <li><a href="{{{groupPageUrl}}}">{{name}}</a> <span class="badge">{{size}}</span></li>
+      <li><a href="{{{groupPageUrl}}}">{{name}}</a> <span class="badge">{{size}}</span></li>
       {{/popularGroupList}}
     </ul>
   </div>
diff --git a/views/includes/removedItemList.html b/views/includes/removedItemList.html
index 396c1d633..244df0356 100644
--- a/views/includes/removedItemList.html
+++ b/views/includes/removedItemList.html
@@ -1,11 +1,11 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class="text-center td-fit"><a href="?orderBy=model&orderDir=asc">Type</a></th>
-      <th class="">Item</th>
-      <th class="">Reason</th>
-      <th class="text-center td-fit"><a href="?orderBy=remover&orderDir=asc">Removed By</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=removed&orderDir=desc">Date</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=model&amp;orderDir=asc">Type</a></th>
+      <th>Item</th>
+      <th>Reason</th>
+      <th class="text-center td-fit"><a href="?orderBy=remover&amp;orderDir=asc">Removed By</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=removed&amp;orderDir=desc">Date</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/scriptAuthorToolsPanel.html b/views/includes/scriptAuthorToolsPanel.html
index 8c42bb8a2..41dd52444 100644
--- a/views/includes/scriptAuthorToolsPanel.html
+++ b/views/includes/scriptAuthorToolsPanel.html
@@ -5,8 +5,8 @@
   </div>
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
-      <li><a href="{{{script.scriptEditMetadataPageUrl}}}" class=""><i class="fa fa-edit"></i> Edit Script Info</a></li>
-      <li><a href="{{{script.scriptEditSourcePageUrl}}}" class=""><i class="fa fa-file-text"></i> Edit Script</a></li>
+      <li><a href="{{{script.scriptEditMetadataPageUrl}}}"><i class="fa fa-edit"></i> Edit Script Info</a></li>
+      <li><a href="{{{script.scriptEditSourcePageUrl}}}"><i class="fa fa-file-text"></i> Edit Script</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/includes/scriptPageHeader.html b/views/includes/scriptPageHeader.html
index f44c1db69..e8ac5145a 100644
--- a/views/includes/scriptPageHeader.html
+++ b/views/includes/scriptPageHeader.html
@@ -1,13 +1,18 @@
 <h2 class="page-heading">
   <a href="{{{script.scriptInstallPageUrl}}}" class="pull-right">
     {{#script.isLib}}
-      <button class="btn btn-info"><i class="fa fa-file-text-o"></i> Raw Source</button>
+    <button class="btn btn-info"><i class="fa fa-file-text-o"></i> Raw Source</button>
     {{/script.isLib}}
     {{^script.isLib}}
-      <button class="btn btn-info"><i class="fa fa-download"></i> Install</button>
+    <button class="btn btn-info"><i class="fa fa-download"></i> Install</button>
     {{/script.isLib}}
   </a>
-  {{#script.icon45Url}}<span class="page-heading-icon"><img src="{{{script.icon45Url}}}" alt="" /></span> {{/script.icon45Url}} <a href="{{{script.author.userPageUrl}}}" class="script-author">{{script.author.name}}</a><span class="path-divider">/</span><a href="{{{script.scriptPageUrl}}}" class="script-name">{{script.name}}</a>
+  {{#script.icon45Url}}
+  <span class="page-heading-icon"><img src="{{{script.icon45Url}}}" alt="" /></span>
+  {{/script.icon45Url}}
+  <a href="{{{script.author.userPageUrl}}}" class="script-author">{{script.author.name}}</a>
+  <span class="path-divider">/</span>
+  <a href="{{{script.scriptPageUrl}}}" class="script-name">{{script.name}}</a>
 </h2>
 <nav class="navbar navbar-default navbar-static-top" role="navigation">
   <div class="navbar-header">
@@ -17,7 +22,7 @@ <h2 class="page-heading">
   </div>
   <div class="navbar-collapse collapse in" id="content-navbar">
     <ul class="nav navbar-nav">
-      <li class="{{#isScriptPage}}active{{/isScriptPage}}"><a href="{{{script.scriptPageUrl}}}" class="">About</a></li>
+      <li class="{{#isScriptPage}}active{{/isScriptPage}}"><a href="{{{script.scriptPageUrl}}}">About</a></li>
       <li class="{{#isScriptViewSourcePage}}active{{/isScriptViewSourcePage}}"><a href="{{{script.scriptViewSourcePageUrl}}}" class="{{^script.scriptViewSourcePageUrl}}disabled{{/script.scriptViewSourcePageUrl}}">Source Code</a></li>
       <li class="{{#isScriptIssuesPage}}active{{/isScriptIssuesPage}}"><a href="{{{script.scriptIssuesPageUrl}}}" class="{{^script.scriptIssuesPageUrl}}disabled{{/script.scriptIssuesPageUrl}}">Issues <span class="badge">{{issueCount}}</span></a></li>
     </ul>
diff --git a/views/includes/searchBar.html b/views/includes/searchBar.html
index be7602c69..ab219c6a3 100644
--- a/views/includes/searchBar.html
+++ b/views/includes/searchBar.html
@@ -1,6 +1,6 @@
 <form action="{{{searchBarFormAction}}}" method="get">
   {{#searchBarFormHiddenVariables}}
-    <input type="hidden" name="{{name}}" value="{{value}}">
+  <input type="hidden" name="{{name}}" value="{{value}}">
   {{/searchBarFormHiddenVariables}}
   <div class="input-group col-xs-12">
     <input name="q" type="text" placeholder="{{searchBarPlaceholder}}" class="search form-control" value="{{searchBarValue}}" />
diff --git a/views/includes/searchBarPanel.html b/views/includes/searchBarPanel.html
index c497e018c..a8266d33b 100644
--- a/views/includes/searchBarPanel.html
+++ b/views/includes/searchBarPanel.html
@@ -1,5 +1,5 @@
 <div class="panel panel-transparent">
-  <div class="input-group col-xs-12 ">
+  <div class="input-group col-xs-12">
     {{> includes/searchBar.html }}
   </div>
 </div>
diff --git a/views/includes/siteStatsPanel.html b/views/includes/siteStatsPanel.html
index d0d6665fb..97f85be80 100644
--- a/views/includes/siteStatsPanel.html
+++ b/views/includes/siteStatsPanel.html
@@ -12,4 +12,4 @@
       <div class="col-xs-8">{{totalGroups}}</div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/includes/userList.html b/views/includes/userList.html
index a4fa48787..bca78c140 100644
--- a/views/includes/userList.html
+++ b/views/includes/userList.html
@@ -1,8 +1,8 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class=""><a href="?orderBy=name&orderDir=asc">Name</a></th>
-      <th class=""><a href="?orderBy=role&orderDir=asc">Rank</a></th>
+      <th><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
+      <th><a href="?orderBy=role&amp;orderDir=asc">Rank</a></th>
     </tr>
   </thead>
   <tbody>
@@ -13,7 +13,7 @@
           <a href="{{{userPageUrl}}}" class="tr-link-a">{{name}}</a>
         </b>
       </td>
-      <td class="">
+      <td>
         <p>
           <span class="label label-default">{{roleName}}</span>
         </p>
diff --git a/views/includes/userPageHeader.html b/views/includes/userPageHeader.html
index 36b306e13..851a5050f 100644
--- a/views/includes/userPageHeader.html
+++ b/views/includes/userPageHeader.html
@@ -10,7 +10,7 @@ <h2 class="page-heading">
   </div>
   <div class="navbar-collapse collapse in" id="content-navbar">
     <ul class="nav navbar-nav">
-      <li class="{{#isUserPage}}active{{/isUserPage}}"><a href="{{{user.userPageUrl}}}" class="">Profile</a></li>
+      <li class="{{#isUserPage}}active{{/isUserPage}}"><a href="{{{user.userPageUrl}}}">Profile</a></li>
       <li class="{{#isUserScriptListPage}}active{{/isUserScriptListPage}}"><a href="{{{user.userScriptListPageUrl}}}" class="{{^user.userScriptListPageUrl}}disabled{{/user.userScriptListPageUrl}}">Scripts <span class="badge">{{scriptListCount}}</span></a></li>
       <li class="{{#isUserCommentListPage}}active{{/isUserCommentListPage}}"><a href="{{{user.userCommentListPageUrl}}}" class="{{^user.userCommentListPageUrl}}disabled{{/user.userCommentListPageUrl}}">Comments <span class="badge">{{commentListCount}}</span></a></li>
     </ul>
diff --git a/views/includes/userToolsPanel.html b/views/includes/userToolsPanel.html
index cd2de8b0a..c1d989de4 100644
--- a/views/includes/userToolsPanel.html
+++ b/views/includes/userToolsPanel.html
@@ -3,11 +3,11 @@
   <div class="panel-body">
     <ul class="nav nav-pills nav-justified">
       <li><a href="{{{user.userEditProfilePageUrl}}}" class="{{^user.userEditProfilePageUrl}}disabled{{/user.userEditProfilePageUrl}}"><i class="fa fa-user"></i> Edit Profile</a></li>
-      <li><a href="/user/preferences" class=""><i class="fa fa-cogs"></i> Preferences</a></li>
+      <li><a href="/user/preferences"><i class="fa fa-cogs"></i> Preferences</a></li>
     </ul>
     <ul class="nav nav-pills nav-justified">
-      <li><a href="/user/add/scripts" class=""><i class="fa fa-file-code-o"></i> Add Script</a></li>
-      <li><a href="/user/add/lib" class=""><i class="fa fa-folder-open-o"></i> Add Library</a></li>
+      <li><a href="/user/add/scripts"><i class="fa fa-file-code-o"></i> Add Script</a></li>
+      <li><a href="/user/add/lib"><i class="fa fa-folder-open-o"></i> Add Library</a></li>
     </ul>
   </div>
 </div>
diff --git a/views/pages/_templatePage.html b/views/pages/_templatePage.html
index 2411031c1..a70f6e8ea 100644
--- a/views/pages/_templatePage.html
+++ b/views/pages/_templatePage.html
@@ -9,7 +9,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-xs-12">
-        
+
       </div>
     </div>
   </div>
diff --git a/views/pages/adminApiKeysPage.html b/views/pages/adminApiKeysPage.html
index 5c0c6fd26..c66b87d82 100644
--- a/views/pages/adminApiKeysPage.html
+++ b/views/pages/adminApiKeysPage.html
@@ -11,8 +11,8 @@
       <div class="col-xs-12">
         <h1>Auth Strategy API Keys</h1>
         <form class="form-horizontal" role="form" method="post" action="/admin/api/update">
-          <div class="list-group">
-          {{#strategies}}
+          <ul class="list-group">
+            {{#strategies}}
             <li class="list-group-item">
               <h4 class="list-group-item-heading">{{strat}}</h4>
               <div class="row">
@@ -28,11 +28,10 @@ <h4 class="list-group-item-heading">{{strat}}</h4>
                     <input type="text" class="form-control" name="{{{strat}}}[1]" value="{{{key}}}" placeholder="Key">
                   </div>
                 </div>
-
               </div>
             </li>
-          {{/strategies}}
-          </div>
+            {{/strategies}}
+          </ul>
           <div class="container-fluid row">
             <button type="submit" class="btn btn-success col-sm-12">Update</button>
           </div>
diff --git a/views/pages/categoryListPage.html b/views/pages/categoryListPage.html
index 3c010c12f..c006f3b87 100644
--- a/views/pages/categoryListPage.html
+++ b/views/pages/categoryListPage.html
@@ -13,12 +13,12 @@ <h2 class="page-heading">
           Discuss
         </h2>
         <div class="list-group">
-        {{#categoryList}}
+          {{#categoryList}}
           <a href="{{{categoryPageUrl}}}" class="list-group-item">
             <h4 class="list-group-item-heading">{{name}}</h4>
             <p class="list-group-item-text">{{description}}</p>
           </a>
-        {{/categoryList}}
+          {{/categoryList}}
         </div>
         <div class="panel panel-default">
           {{> includes/discussionList.html }}
@@ -26,7 +26,6 @@ <h4 class="list-group-item-heading">{{name}}</h4>
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
     </div>
   </div>
diff --git a/views/pages/discussionListPage.html b/views/pages/discussionListPage.html
index e579eca5a..11da6af2b 100644
--- a/views/pages/discussionListPage.html
+++ b/views/pages/discussionListPage.html
@@ -11,7 +11,7 @@
       <div class="col-sm-12">
         <div class="list-controls row container-fluid">
           <ol class="breadcrumb pull-left">
-            <li class=""><a href="/forum">Forum</a></li>
+            <li><a href="/forum">Forum</a></li>
             <li class="active"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
           </ol>
           <a href="{{{category.categoryPostDiscussionPageUrl}}}" class="btn btn-success pull-right" id="create-topic">
@@ -24,7 +24,6 @@
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
     </div>
   </div>
diff --git a/views/pages/discussionPage.html b/views/pages/discussionPage.html
index cf2abfb85..7995bac3f 100644
--- a/views/pages/discussionPage.html
+++ b/views/pages/discussionPage.html
@@ -5,7 +5,9 @@
   {{> includes/head.html }}
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-markdown/2.2.1/css/bootstrap-markdown.min.css">
   <style>
-    #show-reply-form-when-visible { height: 100px; }
+    #show-reply-form-when-visible {
+      height: 100px;
+    }
   </style>
 </head>
 <body>
@@ -17,8 +19,8 @@
           <div class="col-xs-12">
             <div class="topic-title row container-fluid">
               <ol class="breadcrumb pull-left">
-                <li class=""><a href="/forum">Forum</a></li>
-                <li class=""><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+                <li><a href="/forum">Forum</a></li>
+                <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
                 <li class="active"><a href="{{{discussion.discussionPageUrl}}}">{{discussion.topic}}</a></li>
               </ol>
             </div>
@@ -38,14 +40,11 @@
         </div>
       </div>
       <div class="container-fluid col-sm-4">
-
       </div>
     </div>
   </div>
-
   <div id="show-reply-form-when-visible"></div>
   {{> includes/commentForm.html }}
-
   {{> includes/footer.html }}
   <!-- Markdown Editor -->
   <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js"></script>
diff --git a/views/pages/groupListPage.html b/views/pages/groupListPage.html
index 10f1f5923..122510c29 100644
--- a/views/pages/groupListPage.html
+++ b/views/pages/groupListPage.html
@@ -18,7 +18,6 @@ <h2 class="page-heading">
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
       <div class="col-sm-4">
         {{> includes/searchBarPanel.html }}
diff --git a/views/pages/groupScriptListPage.html b/views/pages/groupScriptListPage.html
index 84beaa99f..350bfb2f4 100644
--- a/views/pages/groupScriptListPage.html
+++ b/views/pages/groupScriptListPage.html
@@ -18,7 +18,6 @@ <h2 class="page-heading">
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
       <div class="col-sm-4">
         {{> includes/searchBarPanel.html }}
diff --git a/views/pages/modPage.html b/views/pages/modPage.html
index 35226f6b9..36aac35cc 100644
--- a/views/pages/modPage.html
+++ b/views/pages/modPage.html
@@ -15,7 +15,7 @@ <h3>Flagged Items</h3>
           <a href="/?flagged=true" class="list-group-item">
             <i class="fa fa-fw fa-file-code-o"></i> <i class="fa fa-fw fa-flag"></i> Flagged Scripts
           </a>
-          <a href="/?library=true&flagged=true" class="list-group-item">
+          <a href="/?library=true&amp;flagged=true" class="list-group-item">
             <i class="fa fa-fw fa-folder-open-o"></i> <i class="fa fa-fw fa-flag"></i> Flagged Libraries
           </a>
           <a href="/users?flagged=true" class="list-group-item">
diff --git a/views/pages/newDiscussionPage.html b/views/pages/newDiscussionPage.html
index 5bf2c07a6..fad7f26ba 100644
--- a/views/pages/newDiscussionPage.html
+++ b/views/pages/newDiscussionPage.html
@@ -15,11 +15,9 @@
             <div class="col-xs-12">
               <div class="topic-title row container-fluid">
                 <ol class="breadcrumb col-xs-12">
-                  <li class=""><a href="/forum">Forum</a></li>
-                  <li class="col-xs-12"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
-                  <li class="col-xs-12">
-                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" class="" placeholder="Topic" required>
-                  </li>
+                  <li><a href="/forum">Forum</a></li>
+                  <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+                  <li><input type="text" id="discussion-topic" name="discussion-topic" size="60" placeholder="Topic" required></li>
                 </ol>
               </div>
               <div class="container-fluid comments">
@@ -33,7 +31,6 @@
           </div>
         </div>
         <div class="container-fluid col-sm-4">
-
         </div>
       </form>
     </div>
diff --git a/views/pages/scriptIssueListPage.html b/views/pages/scriptIssueListPage.html
index 6651c34dc..195ef1e7a 100644
--- a/views/pages/scriptIssueListPage.html
+++ b/views/pages/scriptIssueListPage.html
@@ -13,7 +13,7 @@
         {{> includes/scriptPageHeader.html }}
         <div class="list-controls row container-fluid">
           <ol class="breadcrumb pull-left">
-            <li class=""><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
+            <li><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
             <li class="active"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
           </ol>
           <div class="input-group pull-left col-sm-1">
diff --git a/views/pages/scriptIssuePage.html b/views/pages/scriptIssuePage.html
index 4b83b93bc..92a14d14f 100644
--- a/views/pages/scriptIssuePage.html
+++ b/views/pages/scriptIssuePage.html
@@ -18,8 +18,8 @@
         <div class="col-xs-12">
           <div class="topic-title row container-fluid">
             <ol class="breadcrumb pull-left">
-              <li class=""><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
-              <li class=""><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+              <li><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
+              <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
               <li class="active"><a href="{{{discussion.discussionPageUrl}}}">{{discussion.topic}}</a></li>
             </ol>
             <div class="pull-right">
diff --git a/views/pages/scriptNewIssuePage.html b/views/pages/scriptNewIssuePage.html
index 2d5ba9343..22eb6712f 100644
--- a/views/pages/scriptNewIssuePage.html
+++ b/views/pages/scriptNewIssuePage.html
@@ -15,10 +15,10 @@
             <div class="col-xs-12">
               <div class="topic-title row container-fluid">
                 <ol class="breadcrumb col-xs-12">
-                  <li class=""><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
-                  <li class=""><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
+                  <li><a href="{{{script.scriptPageUrl}}}">{{script.name}}</a></li>
+                  <li><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
                   <li class="col-xs-12">
-                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" class="" placeholder="Topic" required>
+                    <input type="text" id="discussion-topic" name="discussion-topic" size="60" placeholder="Topic" required>
                   </li>
                 </ol>
               </div>
diff --git a/views/pages/userGitHubRepoListPage.html b/views/pages/userGitHubRepoListPage.html
index 2b8195a3e..a805225e4 100644
--- a/views/pages/userGitHubRepoListPage.html
+++ b/views/pages/userGitHubRepoListPage.html
@@ -10,7 +10,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8">
-        <h2 class=""><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{githubUser.login}}</a></h2>
+        <h2><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{githubUser.login}}</a></h2>
         <div class="list-group">
         {{#githubRepoList}}
           <a href="{{{userGitHubRepoPageUrl}}}" class="list-group-item">
diff --git a/views/pages/userGitHubRepoPage.html b/views/pages/userGitHubRepoPage.html
index 4d34da05a..4c6a8070c 100644
--- a/views/pages/userGitHubRepoPage.html
+++ b/views/pages/userGitHubRepoPage.html
@@ -10,7 +10,7 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-8">
-        <h2 class=""><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{repo.owner.login}}</a><span class="path-divider">/</span><a href="{{{userGitHubRepoPageUrl}}}" class="script-name">{{repo.name}}</a></h2>
+        <h2><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{repo.owner.login}}</a><span class="path-divider">/</span><a href="{{{userGitHubRepoPageUrl}}}" class="script-name">{{repo.name}}</a></h2>
 
         <div class="panel panel-default">
           <div class="panel-body">

From f334c7a439ca98953f94df13afa1e9f75e431f6e Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 12:02:27 +0200
Subject: [PATCH 08/14] Revert ampersand entities in URLs;

---
 views/includes/discussionList.html  | 8 ++++----
 views/includes/groupList.html       | 4 ++--
 views/includes/removedItemList.html | 6 +++---
 views/includes/scriptList.html      | 8 ++++----
 views/includes/userList.html        | 4 ++--
 views/pages/modPage.html            | 2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/views/includes/discussionList.html b/views/includes/discussionList.html
index db83b6321..26c5f60af 100644
--- a/views/includes/discussionList.html
+++ b/views/includes/discussionList.html
@@ -2,15 +2,15 @@
   <table class="table table-hover table-condensed table-striped">
     <thead>
       <tr>
-        <th class="text-center"><a href="?orderBy=topic&amp;orderDir=asc">Topic</a></th>
+        <th class="text-center"><a href="?orderBy=topic&orderDir=asc">Topic</a></th>
         {{#multipleCategories}}
         <th class="text-center td-fit">Category</th>
         {{/multipleCategories}}
         <th class="text-center td-fit">Users</th>
-        <th class="text-center td-fit"><a href="?orderBy=comments&amp;orderDir=desc">Posts</a></th>
+        <th class="text-center td-fit"><a href="?orderBy=comments&orderDir=desc">Posts</a></th>
         <th class="text-center td-fit">Views</th>
-        <th class="text-center td-fit"><a href="?orderBy=created&amp;orderDir=desc">Created</a></th>
-        <th class="text-center td-fit"><a href="?orderBy=updated&amp;orderDir=desc">Updated</a></th>
+        <th class="text-center td-fit"><a href="?orderBy=created&orderDir=desc">Created</a></th>
+        <th class="text-center td-fit"><a href="?orderBy=updated&orderDir=desc">Updated</a></th>
       </tr>
     </thead>
     <tbody>
diff --git a/views/includes/groupList.html b/views/includes/groupList.html
index d71825249..6d5feb649 100644
--- a/views/includes/groupList.html
+++ b/views/includes/groupList.html
@@ -1,9 +1,9 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
+      <th><a href="?orderBy=name&orderDir=asc">Name</a></th>
       <th class="text-center">Size</th>
-      <th class="text-center"><a href="?orderBy=rating&amp;orderDir=desc">Rating</a></th>
+      <th class="text-center"><a href="?orderBy=rating&orderDir=desc">Rating</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/removedItemList.html b/views/includes/removedItemList.html
index 244df0356..2b55f1011 100644
--- a/views/includes/removedItemList.html
+++ b/views/includes/removedItemList.html
@@ -1,11 +1,11 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th class="text-center td-fit"><a href="?orderBy=model&amp;orderDir=asc">Type</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=model&orderDir=asc">Type</a></th>
       <th>Item</th>
       <th>Reason</th>
-      <th class="text-center td-fit"><a href="?orderBy=remover&amp;orderDir=asc">Removed By</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=removed&amp;orderDir=desc">Date</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=remover&orderDir=asc">Removed By</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=removed&orderDir=desc">Date</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/scriptList.html b/views/includes/scriptList.html
index 20f4a5dd2..300e6ecaa 100644
--- a/views/includes/scriptList.html
+++ b/views/includes/scriptList.html
@@ -1,10 +1,10 @@
 <table class="table table-hover">
   <thead>
     <tr>
-      <th class="text-center"><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=installs&amp;orderDir=desc">Installs</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=rating&amp;orderDir=desc">Rating</a></th>
-      <th class="text-center td-fit"><a href="?orderBy=updated&amp;orderDir=desc">Last Updated</a></th>
+      <th class="text-center"><a href="?orderBy=name&orderDir=asc">Name</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=installs&orderDir=desc">Installs</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=rating&orderDir=desc">Rating</a></th>
+      <th class="text-center td-fit"><a href="?orderBy=updated&orderDir=desc">Last Updated</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/includes/userList.html b/views/includes/userList.html
index bca78c140..b04f1a8a9 100644
--- a/views/includes/userList.html
+++ b/views/includes/userList.html
@@ -1,8 +1,8 @@
 <table class="table table-hover table-condensed">
   <thead>
     <tr>
-      <th><a href="?orderBy=name&amp;orderDir=asc">Name</a></th>
-      <th><a href="?orderBy=role&amp;orderDir=asc">Rank</a></th>
+      <th><a href="?orderBy=name&orderDir=asc">Name</a></th>
+      <th><a href="?orderBy=role&orderDir=asc">Rank</a></th>
     </tr>
   </thead>
   <tbody>
diff --git a/views/pages/modPage.html b/views/pages/modPage.html
index 36aac35cc..35226f6b9 100644
--- a/views/pages/modPage.html
+++ b/views/pages/modPage.html
@@ -15,7 +15,7 @@ <h3>Flagged Items</h3>
           <a href="/?flagged=true" class="list-group-item">
             <i class="fa fa-fw fa-file-code-o"></i> <i class="fa fa-fw fa-flag"></i> Flagged Scripts
           </a>
-          <a href="/?library=true&amp;flagged=true" class="list-group-item">
+          <a href="/?library=true&flagged=true" class="list-group-item">
             <i class="fa fa-fw fa-folder-open-o"></i> <i class="fa fa-fw fa-flag"></i> Flagged Libraries
           </a>
           <a href="/users?flagged=true" class="list-group-item">

From 2596114761878dc800334983e3be661874b4aaa1 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 13:02:39 +0200
Subject: [PATCH 09/14] * Valid HTML; * Consistency;

---
 views/flagged.html                       |  23 +--
 views/footer.html                        |  22 +--
 views/graveyard.html                     |   6 +-
 views/groupsList.html                    |   2 +-
 views/header.html                        | 177 +++++++++++------------
 views/includes/scriptPageHeader.html     |   6 +-
 views/includes/siteStatsPanel.html       |   4 +-
 views/pages/_templatePage.html           |   1 -
 views/pages/loginPage.html               |   9 +-
 views/pages/newDiscussionPage.html       |   1 -
 views/pages/newScriptPage.html           |  96 ++++++------
 views/pages/removedItemListPage.html     |   1 -
 views/pages/scriptEditMetadataPage.html  |   7 +-
 views/pages/scriptIssueListPage.html     |   1 -
 views/pages/scriptNewIssuePage.html      |   1 -
 views/pages/userCommentListPage.html     |   2 -
 views/pages/userEditPreferencesPage.html |   2 +-
 views/pages/userEditProfilePage.html     |   2 +-
 views/pages/userGitHubRepoListPage.html  |   5 +-
 views/pages/userListPage.html            |   1 -
 views/pages/userManageGitHub.html        |  24 +--
 views/pagination.html                    |  18 +--
 views/removedList.html                   |  26 ++--
 views/script.html                        | 137 +++++++++---------
 views/scriptEdit.html                    |  84 +++++------
 views/scriptsList.html                   |   1 -
 views/user.html                          |  74 +++++-----
 views/userAdmin.html                     |  37 +++--
 views/usersList.html                     |   7 +-
 29 files changed, 380 insertions(+), 397 deletions(-)

diff --git a/views/flagged.html b/views/flagged.html
index f4dfab1c1..36d549205 100644
--- a/views/flagged.html
+++ b/views/flagged.html
@@ -4,22 +4,23 @@ <h1 class="pop-scripts-header">Flagged for Removal</h1>
 </div>
 <div class="content-box creation-box">
   <h2>Content Type</h2>
-{{#usersType}}
+  {{#usersType}}
   <strong>Users</strong>
-{{/usersType}}
-{{^usersType}}
+  {{/usersType}}
+  {{^usersType}}
   <a href="/flagged/users">Users</a>
-{{/usersType}} |
-{{#scriptsType}}
+  {{/usersType}} |
+  {{#scriptsType}}
   <strong>Scripts</strong>
-{{/scriptsType}}
-{{^scriptsType}}
+  {{/scriptsType}}
+  {{^scriptsType}}
   <a href="/flagged/scripts">Scripts</a>
-{{/scriptsType}}
+  {{/scriptsType}}
 </div>
-<br /><br />
+<br />
+<br />
 <div class="centered-content">
-{{> usersList.html}}
-{{> scriptsList.html}}
+  {{> usersList.html}}
+  {{> scriptsList.html}}
 </div>
 {{> footer.html}}
diff --git a/views/footer.html b/views/footer.html
index 7468f3217..3a30ecc25 100644
--- a/views/footer.html
+++ b/views/footer.html
@@ -1,12 +1,12 @@
-		<footer>
-			<div class="centered-content">
-				<a class="footer-link" href="https://github.com/OpenUserJs/OpenUserJS.org/wiki/_pages">About</a>
-				<a class="footer-link" href="https://github.com/orgs/OpenUserJs/members">Collaborators</a>
-				<a class="footer-link" href="https://github.com/OpenUserJs/OpenUserJS.org">Join Us On GitHub</a>
-				<p id="copyright">
-					&copy; 2014 <a href="https://github.com/OpenUserJs">OpenUserJS Group</a>
-				</p>
-			</div>
-		</footer>
-	</body>
+    <footer>
+      <div class="centered-content">
+        <a class="footer-link" href="https://github.com/OpenUserJs/OpenUserJS.org/wiki/_pages">About</a>
+        <a class="footer-link" href="https://github.com/orgs/OpenUserJs/members">Collaborators</a>
+        <a class="footer-link" href="https://github.com/OpenUserJs/OpenUserJS.org">Join Us On GitHub</a>
+        <p id="copyright">
+          &copy; 2014 <a href="https://github.com/OpenUserJs">OpenUserJS Group</a>
+        </p>
+      </div>
+    </footer>
+  </body>
 </html>
diff --git a/views/graveyard.html b/views/graveyard.html
index 643f88977..8de341598 100644
--- a/views/graveyard.html
+++ b/views/graveyard.html
@@ -4,17 +4,17 @@ <h1 class="pop-scripts-header">Removed Content</h1>
 </div>
 <div class="content-box creation-box">
   <h2>Content Type</h2>
-{{#contentTypes}}
+  {{#contentTypes}}
   {{#selected}}
   <strong>{{name}}</strong>
   {{/selected}}
   {{^selected}}
   <a href="{{url}}">{{name}}</a>
   {{/selected}}{{^last}} | {{/last}}
-{{/contentTypes}}
+  {{/contentTypes}}
 </div>
 <br /><br />
 <div class="centered-content">
-{{> removedList.html}}
+  {{> removedList.html}}
 </div>
 {{> footer.html}}
diff --git a/views/groupsList.html b/views/groupsList.html
index 1c69fe4e1..a7bc37c51 100644
--- a/views/groupsList.html
+++ b/views/groupsList.html
@@ -8,6 +8,6 @@ <h2 class="group-title"><a href="{{{url}}}">{{name}}</a> - {{size}} script{{#mul
   </ul>
   {{/groups}}
   <br />
-{{> pagination.html}}
+  {{> pagination.html}}
 </section>
 {{/groupsList}}
diff --git a/views/header.html b/views/header.html
index 4a90c89e1..934265aa6 100644
--- a/views/header.html
+++ b/views/header.html
@@ -1,91 +1,88 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
-	
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>{{title}}</title>
-		<link rel="shortcut icon" href="/images/favicon.ico" >
-		<link href='https://fonts.googleapis.com/css?family=Squada+One' rel='stylesheet' type='text/css'>
-		<link href="/css/normalize.css" rel="stylesheet" type="text/css" media="all" />
-		<link href="/css/main.css" rel="stylesheet" type="text/css" media="all" />
-		<link href="/css/home.css" rel="stylesheet" type="text/css" media="all" />
-                <link href="/css/github.css" rel="stylesheet" type="text/css" media="all" />
-	</head>
-	
-	
-	<body>
-		<header id="masthead" >
-			
-			<div id="tophead">
-				<section class="centered-content">
-					
-					<h1 id="logo"><a id="logo-anchor" href="/">OpenUserJS.org</a></h1>
-                                        {{#username}}
-                                        <form id="login-form" action="/logout" method="get">
-                                          <a id="profile-link" href="/users/{{username}}">{{username}}</a>
-                                          <input type="submit" value="Logout" title="Logout"/>
-                                        {{/username}}
-                                        {{^username}}
-					<form id="login-form" action="/auth/" method="post">
-						<input type="text" name="username" required="" maxlength="100" placeholder="username" />
-						<input type="submit" value="Login / Register" title="Login or Register"/>
-                                        {{/username}}
-					</form>
-				</section>
-			</div>
-			
-			<div id="nav-bar">
-				<nav id="nav-buttons" class="centered-content">
-					<div class="button-div">
-						<a class="nav-anchor" href="/">
-							<button class="nav-button" title="All the Scripts" type="button">
-								<img src="/images/icons_scripts.png" />
-								<p class="nav-button-label">
-									Scripts
-								</p>
-							</button>
-						</a>
-					</div>
-					<div class="button-div">
-                                          <a class="nav-anchor" href="/groups">
-						<button class="nav-button" title="All the Groups" type="button">
-							<img src="/images/icons_groups.png" />
-							<p class="nav-button-label">
-								Groups
-							</p>
-						</button>
-                                          </a>
-					</div>
-					<div class="button-div">
-                                          <a class="nav-anchor" href="/corner">
-						<button class="nav-button" title="Propose Ideas & Request Scripts" type="button">
-							<img src="/images/icons_beggar.png"/>
-							<p class="nav-button-label">
-								Beggar's Corner
-							</p>
-						</button>
-                                          </a>
-					</div>
-					<div class="button-div">
-						<a class="nav-anchor" href="/toolbox">
-							<button class="nav-button" title="Development Libraries" type="button">
-								<img src="/images/icons_toolbox.png" />
-								<p class="nav-button-label">
-									The Toolbox
-								</p>
-							</button>
-						</a>
-					</div>
-					<div class="button-div">
-                                          <a class="nav-anchor" href="/garage">
-						<button class="nav-button" title="Talk Shop, Get Help" type="button">
-							<img src="/images/icons_garage.png" />
-							<p class="nav-button-label">
-								The Garage
-							</p>
-						</button>
-                                          </a>
-					</div>
-				</nav>
-			</div>
-		</header>
+
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>{{title}}</title>
+  <link rel="shortcut icon" href="/images/favicon.ico">
+  <link href='https://fonts.googleapis.com/css?family=Squada+One' rel='stylesheet' type='text/css'>
+  <link href="/css/normalize.css" rel="stylesheet" type="text/css" media="all" />
+  <link href="/css/main.css" rel="stylesheet" type="text/css" media="all" />
+  <link href="/css/home.css" rel="stylesheet" type="text/css" media="all" />
+  <link href="/css/github.css" rel="stylesheet" type="text/css" media="all" />
+</head>
+
+<body>
+  <header id="masthead">
+    <div id="tophead">
+      <section class="centered-content">
+        <h1 id="logo"><a id="logo-anchor" href="/">OpenUserJS.org</a></h1>
+        {{#username}}
+        <form id="login-form" action="/logout" method="get">
+          <a id="profile-link" href="/users/{{username}}">{{username}}</a>
+          <input type="submit" value="Logout" title="Logout" />
+        </form>
+        {{/username}}
+        {{^username}}
+        <form id="login-form" action="/auth/" method="post">
+          <input type="text" name="username" required maxlength="100" placeholder="username" />
+          <input type="submit" value="Login / Register" title="Login or Register" />
+        </form>
+        {{/username}}
+      </section>
+    </div>
+    <div id="nav-bar">
+      <nav id="nav-buttons" class="centered-content">
+        <div class="button-div">
+          <a class="nav-anchor" href="/">
+            <button class="nav-button" title="All the Scripts" type="button">
+              <img src="/images/icons_scripts.png" />
+              <p class="nav-button-label">
+                Scripts
+              </p>
+            </button>
+          </a>
+        </div>
+        <div class="button-div">
+          <a class="nav-anchor" href="/groups">
+            <button class="nav-button" title="All the Groups" type="button">
+              <img src="/images/icons_groups.png" />
+              <p class="nav-button-label">
+                Groups
+              </p>
+            </button>
+          </a>
+        </div>
+        <div class="button-div">
+          <a class="nav-anchor" href="/corner">
+            <button class="nav-button" title="Propose Ideas & Request Scripts" type="button">
+              <img src="/images/icons_beggar.png" />
+              <p class="nav-button-label">
+                Beggar's Corner
+              </p>
+            </button>
+          </a>
+        </div>
+        <div class="button-div">
+          <a class="nav-anchor" href="/toolbox">
+            <button class="nav-button" title="Development Libraries" type="button">
+              <img src="/images/icons_toolbox.png" />
+              <p class="nav-button-label">
+                The Toolbox
+              </p>
+            </button>
+          </a>
+        </div>
+        <div class="button-div">
+          <a class="nav-anchor" href="/garage">
+            <button class="nav-button" title="Talk Shop, Get Help" type="button">
+              <img src="/images/icons_garage.png" />
+              <p class="nav-button-label">
+                The Garage
+              </p>
+            </button>
+          </a>
+        </div>
+      </nav>
+    </div>
+  </header>
diff --git a/views/includes/scriptPageHeader.html b/views/includes/scriptPageHeader.html
index e8ac5145a..592e7c951 100644
--- a/views/includes/scriptPageHeader.html
+++ b/views/includes/scriptPageHeader.html
@@ -1,10 +1,10 @@
 <h2 class="page-heading">
-  <a href="{{{script.scriptInstallPageUrl}}}" class="pull-right">
+  <a href="{{{script.scriptInstallPageUrl}}}" class="btn btn-info pull-right">
     {{#script.isLib}}
-    <button class="btn btn-info"><i class="fa fa-file-text-o"></i> Raw Source</button>
+    <i class="fa fa-file-text-o"></i> Raw Source
     {{/script.isLib}}
     {{^script.isLib}}
-    <button class="btn btn-info"><i class="fa fa-download"></i> Install</button>
+    <i class="fa fa-download"></i> Install
     {{/script.isLib}}
   </a>
   {{#script.icon45Url}}
diff --git a/views/includes/siteStatsPanel.html b/views/includes/siteStatsPanel.html
index 97f85be80..026408ec1 100644
--- a/views/includes/siteStatsPanel.html
+++ b/views/includes/siteStatsPanel.html
@@ -4,11 +4,11 @@
   </div>
   <div class="panel-body">
     <div class="row">
-      <label for="" class="col-xs-4 text-right">Scripts:</label>
+      <label class="col-xs-4 text-right">Scripts:</label>
       <div class="col-xs-8">{{totalScripts}}</div>
     </div>
     <div class="row">
-      <label for="" class="col-xs-4 text-right">Groups:</label>
+      <label class="col-xs-4 text-right">Groups:</label>
       <div class="col-xs-8">{{totalGroups}}</div>
     </div>
   </div>
diff --git a/views/pages/_templatePage.html b/views/pages/_templatePage.html
index a70f6e8ea..26fa836e5 100644
--- a/views/pages/_templatePage.html
+++ b/views/pages/_templatePage.html
@@ -9,7 +9,6 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-xs-12">
-
       </div>
     </div>
   </div>
diff --git a/views/pages/loginPage.html b/views/pages/loginPage.html
index 1b7c0c736..10da63c13 100644
--- a/views/pages/loginPage.html
+++ b/views/pages/loginPage.html
@@ -11,7 +11,7 @@
       <form action="/auth/" method="post" class="form-signin">
         <h3>
           Login
-          <p class="small">Login with your preferred OAuth/OpenID service.</p>
+          <span class="help-block small">Login with your preferred OAuth/OpenID service.</span>
         </h3>
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
@@ -26,17 +26,16 @@ <h3>
       <form action="/auth/" method="post" class="form-register">
         <h3>
           Register
-          <p class="small">Sign up with a OAuth/OpenID service.</p>
+          <span class="help-block small">Sign up with a OAuth/OpenID service.</span>
         </h3>
-        
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
           <input class="form-control" type="text" name="username" value="{{wantname}}" placeholder="Username">
           <span class="input-group-btn">
             <select name="auth" class="btn btn-addon-default" style="border-radius: 0px;">
-            {{#strategies}}
+              {{#strategies}}
               <option value="{{strat}}" {{#selected}}selected="selected"{{/selected}}>{{display}}</option>
-            {{/strategies}}
+              {{/strategies}}
             </select>
           </span>
           <span class="input-group-btn">
diff --git a/views/pages/newDiscussionPage.html b/views/pages/newDiscussionPage.html
index fad7f26ba..f0c5d24d6 100644
--- a/views/pages/newDiscussionPage.html
+++ b/views/pages/newDiscussionPage.html
@@ -35,7 +35,6 @@
       </form>
     </div>
   </div>
-
   {{> includes/footer.html }}
   <!-- Markdown Editor -->
   <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js"></script>
diff --git a/views/pages/newScriptPage.html b/views/pages/newScriptPage.html
index fc54c58b1..4f37fad05 100644
--- a/views/pages/newScriptPage.html
+++ b/views/pages/newScriptPage.html
@@ -4,9 +4,9 @@
   <title>{{title}}</title>
   {{> includes/head.html }}
   <style>
-  .script-metadata-definitions .list-group-item-heading code {
-    white-space: pre-line;
-  }
+    .script-metadata-definitions .list-group-item-heading code {
+      white-space: pre-line;
+    }
   </style>
 </head>
 <body>
@@ -16,57 +16,57 @@
       <div class="col-xs-12">
         <div class="col-md-4">
           {{#newUserJS}}
-            <h2><i class="fa fa-tags"></i> Script Metadata</h2>
-            <div class="panel panel-default">
-              <div class="panel-body">
-                <p>You can read about most userscript metadata blocks on the <a href="http://wiki.greasespot.net/Metadata_Block">greasespot wiki</a> and at the <a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block">greasemonkey sourceforge wiki</a>.</p>
-              </div>
+          <h2><i class="fa fa-tags"></i> Script Metadata</h2>
+          <div class="panel panel-default">
+            <div class="panel-body">
+              <p>You can read about most userscript metadata blocks on the <a href="http://wiki.greasespot.net/Metadata_Block">greasespot wiki</a> and at the <a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block">greasemonkey sourceforge wiki</a>.</p>
+            </div>
+          </div>
+          <h3>OpenUserJS.org Specific</h3>
+          <div class="list-group script-metadata-definitions">
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@author {{#authedUser}}{{authedUser.name}}{{/authedUser}}{{^authedUser}}username{{/authedUser}}</code></h4>
+              <p class="list-group-item-text">The author of the script. Required for <a href="#collaboration">Collaboration</a>. Only the author may edit.</p>
+            </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@collaborator username</code></h4>
+              <p class="list-group-item-text">Can be defined multiple times. Required for <a href="#collaboration">Collaboration</a>.</p>
+            </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@description This script even does the laundry!</code></h4>
+              <p class="list-group-item-text">Specially formatted on the script page.</p>
             </div>
-            <h3>OpenUserJS.org Specific</h3>
-            <div class="list-group script-metadata-definitions">
-              <div class="list-group-item active">
-                <h4 class="list-group-item-heading"><code>@author {{#authedUser}}{{authedUser.name}}{{/authedUser}}{{^authedUser}}username{{/authedUser}}</code></h4>
-                <p class="list-group-item-text">The author of the script. Required for <a href="#collaboration">Collaboration</a>. Only the author may edit.</p>
-              </div>
-              <div class="list-group-item active">
-                <h4 class="list-group-item-heading"><code>@collaborator username</code></h4>
-                <p class="list-group-item-text">Can be defined multiple times. Required for <a href="#collaboration">Collaboration</a>.</p>
-              </div>
-              <div class="list-group-item active">
-                <h4 class="list-group-item-heading"><code>@description This script even does the laundry!</code></h4>
-                <p class="list-group-item-text">Specially formatted on the script page.</p>
-              </div>
 
-              <div class="list-group-item active">
-                <h4 class="list-group-item-heading"><code>@copyright Year, Author (Author Homepage)</code></h4>
-                <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40copyright">Wiki Link</a>] Specially formatted on the script page.</p>
-              </div>
-              <div class="list-group-item active">
-                <h4 class="list-group-item-heading"><code>@icon url</code></h4>
-                <p class="list-group-item-text">A url or data url. Used in the script list page at 16px and on the script page at ~45px.</p>
-              </div>
-              <div class="list-group-item active">
-                <h4 class="list-group-item-heading"><code>@license License Type; License Homepage</code></h4>
-                <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40license">Wiki Link</a>] Specially formatted on the script page.</p>
-              </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@copyright Year, Author (Author Homepage)</code></h4>
+              <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40copyright">Wiki Link</a>] Specially formatted on the script page.</p>
+            </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@icon url</code></h4>
+              <p class="list-group-item-text">A url or data url. Used in the script list page at 16px and on the script page at ~45px.</p>
+            </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@license License Type; License Homepage</code></h4>
+              <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40license">Wiki Link</a>] Specially formatted on the script page.</p>
             </div>
+          </div>
 
-            <a name="collaboration"></a>
-            <h3>Collaboration</h3>
-            <div class="panel panel-default">
-              <div class="panel-body">
-                <p>To allow other users to upload modified versions of your script to your account, add <code>@author Zren</code> to the metadata of your script, along with <code>@collaborator username</code> for every user you wish to give write access. Only the real author of the script can modify these metadata keys. Collaborators cannot use GitHub integration to update the script. Add them as collaborators to the GitHub repo instead.</p>
-              </div>
+          <a name="collaboration"></a>
+          <h3>Collaboration</h3>
+          <div class="panel panel-default">
+            <div class="panel-body">
+              <p>To allow other users to upload modified versions of your script to your account, add <code>@author Zren</code> to the metadata of your script, along with <code>@collaborator username</code> for every user you wish to give write access. Only the real author of the script can modify these metadata keys. Collaborators cannot use GitHub integration to update the script. Add them as collaborators to the GitHub repo instead.</p>
             </div>
+          </div>
           {{/newUserJS}}
           {{#newJSLibrary}}
-            <h2><i class="fa fa-question"></i> Library Docs</h2>
-            <div class="panel panel-default">
-              <div class="panel-body">
-                <h3>OpenUserJS.org Specific</h3>
-                <p>Any UserScript on OpenUserJS.org that <code>//@require</code>'s libraries also on OpenUserJS.org will link to the library on the UserScript page.</p>
-              </div>
+          <h2><i class="fa fa-question"></i> Library Docs</h2>
+          <div class="panel panel-default">
+            <div class="panel-body">
+              <h3>OpenUserJS.org Specific</h3>
+              <p>Any UserScript on OpenUserJS.org that <code>//@require</code>'s libraries also on OpenUserJS.org will link to the library on the UserScript page.</p>
             </div>
+          </div>
           {{/newJSLibrary}}
         </div>
         <div class="col-md-4">
@@ -85,12 +85,12 @@ <h4 class="list-group-item-heading">Upload Script</h4>
                   <input type="hidden" name="uploadScript" value="true">
                   {{#newJSLibrary}}
                   <div class="form-group">
-                    <input type="text" required class="form-control" name="script_name" placeholder="Script Name" required>
+                    <input type="text" class="form-control" name="script_name" placeholder="Script Name" required />
                   </div>
                   {{/newJSLibrary}}
                   <div class="form-group">
                     <div class="input-group">
-                      <input type="file" required class="form-control" name="script" placeholder="Enter email">
+                      <input type="file" class="form-control" name="script" placeholder="Enter email" required />
                       <span class="input-group-btn">
                         <button class="btn btn-success" type="submit">Submit</button>
                       </span>
diff --git a/views/pages/removedItemListPage.html b/views/pages/removedItemListPage.html
index 7463194dd..363af317f 100644
--- a/views/pages/removedItemListPage.html
+++ b/views/pages/removedItemListPage.html
@@ -18,7 +18,6 @@ <h2 class="page-heading">
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
       <div class="col-sm-4">
         {{> includes/searchBarPanel.html }}
diff --git a/views/pages/scriptEditMetadataPage.html b/views/pages/scriptEditMetadataPage.html
index 59bb3f1bc..7b062c7c8 100644
--- a/views/pages/scriptEditMetadataPage.html
+++ b/views/pages/scriptEditMetadataPage.html
@@ -29,8 +29,6 @@ <h2>Description</h2>
                   </div>
                 </div>
               </div>
-
-
             </div>
           </div>
         </div>
@@ -44,13 +42,12 @@ <h2>Description</h2>
               <input type="hidden" id="groups" name="groups" style="width: 100%;" />
             </div>
           </div>
-
           {{> includes/scriptAuthorToolsPanel.html }}
           {{> includes/scriptModToolsPanel.html }}
           {{/script}}
         </div>
       </div>
-   </form>
+    </form>
   </div>
   {{> includes/footer.html }}
   <!-- Markdown Editor -->
@@ -97,7 +94,7 @@ <h2>Description</h2>
             });
             query.callback(groups);
           }});
-      }});
+        }});
       $('#groups').select2('data', preload_data);
     });
   </script>
diff --git a/views/pages/scriptIssueListPage.html b/views/pages/scriptIssueListPage.html
index 195ef1e7a..6b055226c 100644
--- a/views/pages/scriptIssueListPage.html
+++ b/views/pages/scriptIssueListPage.html
@@ -17,7 +17,6 @@
             <li class="active"><a href="{{{category.categoryPageUrl}}}">{{category.name}}</a></li>
           </ol>
           <div class="input-group pull-left col-sm-1">
-
           </div>
           <a class="btn btn-sm btn-success pull-right" href="{{{category.categoryPostDiscussionPageUrl}}}" id="create-topic">
             <i class="fa fa-plus"></i> New Issue
diff --git a/views/pages/scriptNewIssuePage.html b/views/pages/scriptNewIssuePage.html
index 22eb6712f..df2d3eafb 100644
--- a/views/pages/scriptNewIssuePage.html
+++ b/views/pages/scriptNewIssuePage.html
@@ -33,7 +33,6 @@
           </div>
         </div>
         <div class="container-fluid col-sm-4">
-
         </div>
       </form>
     </div>
diff --git a/views/pages/userCommentListPage.html b/views/pages/userCommentListPage.html
index 798def33b..d558e6329 100644
--- a/views/pages/userCommentListPage.html
+++ b/views/pages/userCommentListPage.html
@@ -12,7 +12,6 @@
         <div class="row">
           <div class="col-xs-12">
             {{> includes/userPageHeader.html }}
-
             <div class="container-fluid comments">
               <div class="row">
                 <section class="topic-area list-group">
@@ -38,7 +37,6 @@
                 </section>
               </div>
             </div>
-
           </div>
         </div>
       </div>
diff --git a/views/pages/userEditPreferencesPage.html b/views/pages/userEditPreferencesPage.html
index e5a1aa61c..b4341c3f0 100644
--- a/views/pages/userEditPreferencesPage.html
+++ b/views/pages/userEditPreferencesPage.html
@@ -36,7 +36,7 @@ <h2 class="edit-authentication">Authentication</h2>
                       </div>
                     </div>
                   </form>
-               </div>
+                </div>
               </div>
             </div>
           </div>
diff --git a/views/pages/userEditProfilePage.html b/views/pages/userEditProfilePage.html
index 64318d1a1..0e70a7249 100644
--- a/views/pages/userEditProfilePage.html
+++ b/views/pages/userEditProfilePage.html
@@ -18,7 +18,7 @@
               <h3>Description</h3>
               <p><strong>Use <a target="_blank" href="https://help.github.com/articles/github-flavored-markdown">GitHub Flavored Markdown</a> for formatting.</strong></p>
               <div class="user-content">
-                  <textarea name="about" data-provide="markdown" data-iconlibrary="fa" rows="20" class="col-xs-12">{{user.about}}</textarea>
+                <textarea name="about" data-provide="markdown" data-iconlibrary="fa" rows="20" class="col-xs-12">{{user.about}}</textarea>
               </div>
             </form>
           </div>
diff --git a/views/pages/userGitHubRepoListPage.html b/views/pages/userGitHubRepoListPage.html
index a805225e4..81b1f3f50 100644
--- a/views/pages/userGitHubRepoListPage.html
+++ b/views/pages/userGitHubRepoListPage.html
@@ -12,18 +12,17 @@
       <div class="col-md-8">
         <h2><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{githubUser.login}}</a></h2>
         <div class="list-group">
-        {{#githubRepoList}}
+          {{#githubRepoList}}
           <a href="{{{userGitHubRepoPageUrl}}}" class="list-group-item">
             <h4 class="list-group-item-heading">{{full_name}}</h4>
           </a>
-        {{/githubRepoList}}
+          {{/githubRepoList}}
         </div>
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
       </div>
       <div class="col-md-4">
-
       </div>
     </div>
   </div>
diff --git a/views/pages/userListPage.html b/views/pages/userListPage.html
index c382b352e..82f0e8a3f 100644
--- a/views/pages/userListPage.html
+++ b/views/pages/userListPage.html
@@ -18,7 +18,6 @@ <h2 class="page-heading">
         <div class="text-center">
           {{{paginationRendered}}}
         </div>
-
       </div>
       <div class="col-sm-4">
         {{> includes/searchBarPanel.html }}
diff --git a/views/pages/userManageGitHub.html b/views/pages/userManageGitHub.html
index d22c049d0..18807688b 100644
--- a/views/pages/userManageGitHub.html
+++ b/views/pages/userManageGitHub.html
@@ -20,23 +20,29 @@ <h4 class="list-group-item-heading">Full Repository List</h4>
             <p class="list-group-item-text">Click here to list all GitHub repositories. You can import both userscripts and javascript libraries from this list.</p>
           </a>
         </div>
-
-        <h2>Batch Import UserScripts <div class="small">(From Recently Updated GitHub Repositories)</div></h2>
+        <h2>
+          Batch Import UserScripts
+          <span class="help-block small">(From Recently Updated GitHub Repositories)</span>
+        </h2>
         <form method="post" action="">
           <ul class="list-group">
-          {{#repos}}
+            {{#repos}}
             <li class="list-group-item">
-              <input type="checkbox" name="{{{repo}}}_all" value="{{{repo}}}" /> <strong><a href="https://github.com/{{{user}}}/{{{repo}}}">{{repo}}</a></strong><br />
+              <input type="checkbox" name="{{{repo}}}_all" value="{{{repo}}}" />
+              <strong><a href="https://github.com/{{{user}}}/{{{repo}}}">{{repo}}</a></strong>
+              <br />
               {{#scripts}}
-                <input type="checkbox" name="{{{repo}}}[{{{name}}}]" value="true"/> <a href="https://github.com/{{{user}}}/{{{repo}}}/blob/master{{{path}}}">{{name}}</a><br />
+              <input type="checkbox" name="{{{repo}}}[{{{name}}}]" value="true" />
+              <a href="https://github.com/{{{user}}}/{{{repo}}}/blob/master{{{path}}}">{{name}}</a>
+              <br />
               {{/scripts}}
             </li>
-          {{/repos}}
-          {{^repos}}
+            {{/repos}}
+            {{^repos}}
             <li class="list-group-item">
-              No scripts in recently updated repositories. Try the full repository list.
+              <em>No scripts in recently updated repositories. Try the full repository list.</em>
             </li>
-          {{/repos}}
+            {{/repos}}
           </ul>
           <div class="container-fluid row">
             <button type="submit" class="btn btn-success col-xs-12 {{^repos}}disabled{{/repos}}">Import Scripts</button>
diff --git a/views/pagination.html b/views/pagination.html
index 16df7b0c8..a4c35faa2 100644
--- a/views/pagination.html
+++ b/views/pagination.html
@@ -1,11 +1,11 @@
 <div class="paging-section">
-<div class="paging-controls-box">
-  {{#previous}}
-  <a class="paging-anchor" href="{{{baseUrl}}}{{size}}{{orderBy}}{{direction}}{{previous}}"><img src="/images/page-left.png"/></a>
-  {{/previous}}
-  <span class="page-number">{{pageNumber}}</span>
-  {{#next}}
-  <a class="paging-anchor" href="{{{baseUrl}}}{{size}}{{orderBy}}{{direction}}{{next}}"><img src="/images/page-right.png"/></a>
-  {{/next}}
-</div>
+  <div class="paging-controls-box">
+    {{#previous}}
+    <a class="paging-anchor" href="{{{baseUrl}}}{{size}}{{orderBy}}{{direction}}{{previous}}"><img src="/images/page-left.png" /></a>
+    {{/previous}}
+    <span class="page-number">{{pageNumber}}</span>
+    {{#next}}
+    <a class="paging-anchor" href="{{{baseUrl}}}{{size}}{{orderBy}}{{direction}}{{next}}"><img src="/images/page-right.png" /></a>
+    {{/next}}
+  </div>
 </div>
diff --git a/views/removedList.html b/views/removedList.html
index dd3c0dd44..be1160e69 100644
--- a/views/removedList.html
+++ b/views/removedList.html
@@ -1,17 +1,17 @@
 {{#removedList}}
 <section class="scripts-section">
-{{#removed}}
-<ul class="scripts-list">
-  <li class="script">
-    <h2 class="script-title">Removed {{removed}} by <a href="/users/{{remover}}">{{remover}}</a></h2>
-    {{#content}}
-    <strong>{{key}}:</strong> {{value}}<br />
-    {{/content}}				
-    <p class="script-description">{{reason}}</p>
-  </li>
-</ul>
-{{/removed}}
-   <br />
-{{> pagination.html}}
+  {{#removed}}
+  <ul class="scripts-list">
+    <li class="script">
+      <h2 class="script-title">Removed {{removed}} by <a href="/users/{{remover}}">{{remover}}</a></h2>
+      {{#content}}
+      <strong>{{key}}:</strong> {{value}}<br />
+      {{/content}}
+      <p class="script-description">{{reason}}</p>
+    </li>
+  </ul>
+  {{/removed}}
+  <br />
+  {{> pagination.html}}
 </section>
 {{/removedList}}
diff --git a/views/script.html b/views/script.html
index 2621bbfab..5d037bb0a 100644
--- a/views/script.html
+++ b/views/script.html
@@ -1,65 +1,62 @@
 {{> header.html}}
 <div class="content-box">
   <section class="sr-section">
-
     <div>
-	    <h1 class="sr-script-title">{{name}}{{#version}}&nbsp;-&nbsp;<span class="version">{{version}}</span>{{/version}}</h1>
-		{{#voteable}}
-	    <div class="voting-div">
-		    <a class="button-anchor up-arrow" href="{{{upUrl}}">
-		         <img src="{{#up}}/images/up-vote-green.png{{/up}}{{^up}}/images/up-vote-grey.png{{/up}}"/>
-		    </a>
-		    <a class="button-anchor down-arrow" href="{{{downUrl}}}">
-		         <img src="{{#down}}/images/down-vote-red.png{{/down}}{{^down}}/images/down-vote-grey.png{{/down}}"/>
-		    </a>
-	    </div>
-	    <span class="header-rating">Rating: {{rating}}</span>
-		{{/voteable}}
+      <h1 class="sr-script-title">{{name}}{{#version}}&nbsp;-&nbsp;<span class="version">{{version}}</span>{{/version}}</h1>
+      {{#voteable}}
+      <div class="voting-div">
+        <a class="button-anchor up-arrow" href="{{{upUrl}}">
+          <img src="{{#up}}/images/up-vote-green.png{{/up}}{{^up}}/images/up-vote-grey.png{{/up}}" />
+        </a>
+        <a class="button-anchor down-arrow" href="{{{downUrl}}}">
+          <img src="{{#down}}/images/down-vote-red.png{{/down}}{{^down}}/images/down-vote-grey.png{{/down}}" />
+        </a>
+      </div>
+      <span class="header-rating">Rating: {{rating}}</span>
+      {{/voteable}}
     </div>
     {{#isLib}}
-    <span class="lib-url"><strong>Library URL: </strong><input type="text" name="lib_url" value="https://openuserjs.org{{{install}}}" size="50"/></span>
+    <span class="lib-url"><strong>Library URL: </strong><input type="text" name="lib_url" value="https://openuserjs.org{{{install}}}" size="50" /></span>
     {{/isLib}}
-	<div class="sr-main-buttons">
-	{{^isLib}}
-	    {{#isYou}}
-	    	<a class="button-anchor" href="{{{edit}}}">
-				<button class="sr-button sr-edit-button" title="Edit" type="button">
-	        		Edit Mode
-	      		</button>
-			</a>
-	    {{/isYou}}
-	    <a class="button-anchor" href="{{{install}}}">
-	      <button class="sr-button sr-install-button" title="Install" type="button">
-	        Install
-	      </button>
-	    </a>
-	    {{/isLib}}
-	    {{#flaggable}}
-	    <a class="button-anchor" href="{{{flagUrl}}}">
-	      <button class="sr-flag-button" title="{{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}"
-		      type="button">
-	    {{#flagged}}<img src="/images/red-flag.png"/>{{/flagged}}{{^flagged}}<img src="/images/white-flag.png"/>{{/flagged}}
-	      </button>
-	    </a>
-	    {{/flaggable}}
-	</div>
-
+    <div class="sr-main-buttons">
+      {{^isLib}}
+      {{#isYou}}
+      <a class="button-anchor" href="{{{edit}}}">
+        <button class="sr-button sr-edit-button" title="Edit" type="button">
+          Edit Mode
+        </button>
+      </a>
+      {{/isYou}}
+      <a class="button-anchor" href="{{{install}}}">
+        <button class="sr-button sr-install-button" title="Install" type="button">
+          Install
+        </button>
+      </a>
+      {{/isLib}}
+      {{#flaggable}}
+      <a class="button-anchor" href="{{{flagUrl}}}">
+        <button class="sr-flag-button" title="{{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}"
+                type="button">
+          {{#flagged}}<img src="/images/red-flag.png" />{{/flagged}}{{^flagged}}<img src="/images/white-flag.png" />{{/flagged}}
+        </button>
+      </a>
+      {{/flaggable}}
+    </div>
     <a class="button-anchor" href="{{{source}}}">
       <button class="sr-button sr-source-button lib-source-button" title="View Source" type="button">
         View Source
       </button>
     </a>
-
     {{^isLib}}<p class="sr-description">{{description}}</p>{{/isLib}}
     <table width="100%">
       <tr class="sr-row">
-	<td class="sr-col1">Author:</td>
-	<td class="sr-col2"><a href="/users/{{author}}">{{author}}</a></td>
+        <td class="sr-col1">Author:</td>
+        <td class="sr-col2"><a href="/users/{{author}}">{{author}}</a></td>
       </tr>
       {{#hasCollab}}
       <tr class="sr-row">
-	<td class="sr-col1">Collaborators:</td>
-	<td class="sr-col2">
+        <td class="sr-col1">Collaborators:</td>
+        <td class="sr-col2">
           {{#collaborators}}
           <a href="/users/{{name}}">{{name}}</a><br />
           {{/collaborators}}
@@ -67,28 +64,28 @@ <h1 class="sr-script-title">{{name}}{{#version}}&nbsp;-&nbsp;<span class="versio
       </tr>
       {{/hasCollab}}
       <tr class="sr-row">
-	<td class="sr-col1">Last Update:</td>
-	<td class="sr-col2">{{updated}}</td>
+        <td class="sr-col1">Last Update:</td>
+        <td class="sr-col2">{{updated}}</td>
       </tr>
       <tr class="sr-row">
-	<td class="sr-col1">Rating:</td>
-	<td class="sr-col2">{{rating}}</td>
+        <td class="sr-col1">Rating:</td>
+        <td class="sr-col2">{{rating}}</td>
       </tr>
       {{^isLib}}
       <tr class="sr-row">
-	<td class="sr-col1">Installs:</td>
-	<td class="sr-col2">{{installs}}</td>
+        <td class="sr-col1">Installs:</td>
+        <td class="sr-col2">{{installs}}</td>
       </tr>
       <tr class="sr-row">
-	<td class="sr-col1">Issues:</td>
-	<td class="sr-col2">
+        <td class="sr-col1">Issues:</td>
+        <td class="sr-col2">
           <a href="{{{issuesUrl}}}">{{issuesCount}} open issues</a><br />
         </td>
       </tr>
       {{#hasGroups}}
       <tr class="sr-row">
-	<td class="sr-col1">Groups:</td>
-	<td class="sr-col2">
+        <td class="sr-col1">Groups:</td>
+        <td class="sr-col2">
           {{#groups}}
           <a href="/group/{{{url}}}">{{name}}</a><br />
           {{/groups}}
@@ -97,8 +94,8 @@ <h1 class="sr-script-title">{{name}}{{#version}}&nbsp;-&nbsp;<span class="versio
       {{/hasGroups}}
       {{#usesLibs}}
       <tr class="sr-row">
-	<td class="sr-col1">Uses Libraries:</td>
-	<td class="sr-col2">
+        <td class="sr-col1">Uses Libraries:</td>
+        <td class="sr-col2">
           {{#libs}}
           <a href="/libs/{{{url}}}">{{name}}</a><br />
           {{/libs}}
@@ -108,16 +105,16 @@ <h1 class="sr-script-title">{{name}}{{#version}}&nbsp;-&nbsp;<span class="versio
       {{/isLib}}
       {{#usedBy}}
       <tr class="sr-row">
-	<td class="sr-col1">Used By:</td>
-	<td class="sr-col2">
+        <td class="sr-col1">Used By:</td>
+        <td class="sr-col2">
           <a href="{{{url}}}">{{count}} script{{#multiple}}s{{/multiple}}</a>
         </td>
       </tr>
       {{/usedBy}}
       {{#moderation}}
       <tr class="sr-row">
-	<td class="sr-col1">Moderation:</td>
-	<td class="sr-col2">Flags = {{flags}} | Threshold = {{threshold}}  | <a href="{{{removeUrl}}}">Remove This Script?</td>
+        <td class="sr-col1">Moderation:</td>
+        <td class="sr-col2">Flags = {{flags}} | Threshold = {{threshold}} | <a href="{{{removeUrl}}}">Remove This Script?</a></td>
       </tr>
       {{/moderation}}
       {{#isFork}}
@@ -125,12 +122,18 @@ <h1 class="sr-script-title">{{name}}{{#version}}&nbsp;-&nbsp;<span class="versio
         <td class="sr-col1">Fork History</td>
         <td class="sr-col2">
           {{#fork}}
-          {{#first}}<a href="/script/{{{url}}">Forked</a>{{/first}}{{^first}}who <a href="/script/{{{url}}">forked</a>{{/first}}{{^original}} from <a href="/users/{{{author}}}">{{author}}</a><br />{{/original}}{{#original}} the original</a> by <a href="/users/{{{author}}}">{{author}}</a>{{/original}}{{/fork}}</td>
-</tr>
-{{/isFork}}
-</table>
-<hr /><p>Have a feature request or found a bug? <a href="{{{openIssueUrl}}}">Let the author know.</a></p>
-{{#about}}<hr /><div class="user-content">{{{about}}}</div>{{/about}}
-</section>
+          {{#first}}<a href="/script/{{{url}}">Forked</a>{{/first}}
+          {{^first}}who <a href="/script/{{{url}}">forked</a>{{/first}}
+          {{^original}} from <a href="/users/{{{author}}}">{{author}}</a><br />{{/original}}
+          {{#original}} the original by <a href="/users/{{{author}}}">{{author}}</a>{{/original}}
+          {{/fork}}
+        </td>
+      </tr>
+      {{/isFork}}
+    </table>
+    <hr />
+    <p>Have a feature request or found a bug? <a href="{{{openIssueUrl}}}">Let the author know.</a></p>
+    {{#about}}<hr /><div class="user-content">{{{about}}}</div>{{/about}}
+  </section>
 </div>
 {{> footer.html}}
diff --git a/views/scriptEdit.html b/views/scriptEdit.html
index 49b1b1923..f54dff2a4 100644
--- a/views/scriptEdit.html
+++ b/views/scriptEdit.html
@@ -1,63 +1,59 @@
 {{> header.html}}
 {{^isLib}}
-<link href="/css/select2.css" rel="stylesheet"/>
+<link href="/css/select2.css" rel="stylesheet" />
 <script type="text/javascript" src="/js/jquery-1.10.2.min.js"></script>
 <script type="text/javascript" src="/js/select2.min.js"></script>
 <script type="text/javascript">
-var preload_groups = {{{groups}}};
-var preload_data = $.map(preload_groups, function (group) {
-  return { id: group, text: group, locked: true };
-});
-$(document).ready(function() {
-  var canAddGroup = true;
-  var canCreateGroup = {{canCreateGroup}};
-  var prevTerm = '';
+  var preload_groups = {{{groups}}};
+  var preload_data = $.map(preload_groups, function (group) {
+    return { id: group, text: group, locked: true };
+  });
+  $(document).ready(function() {
+    var canAddGroup = true;
+    var canCreateGroup = {{canCreateGroup}};
+    var prevTerm = '';
 
-  $('#groups').select2({
-    multiple: true,
-    minimumInputLength: 1,
-    query: function (query){
-      var url = '/api/group/search/' + encodeURIComponent(query.term);
+    $('#groups').select2({
+      multiple: true,
+      minimumInputLength: 1,
+      query: function (query){
+        var url = '/api/group/search/' + encodeURIComponent(query.term);
 
-      if (canCreateGroup) {
-        if (canAddGroup) {
-          if ($('#groups').val().length
-            && $('#groups').val().split(',').indexOf(prevTerm) > -1) {
-            canAddGroup = false;
-          } else {
+        if (canCreateGroup) {
+          if (canAddGroup) {
+            if ($('#groups').val().length
+              && $('#groups').val().split(',').indexOf(prevTerm) > -1) {
+              canAddGroup = false;
+            } else {
+              prevTerm = query.term;
+            }
+          } else if ($('#groups').val().split(',').indexOf(prevTerm) === -1) {
             prevTerm = query.term;
+            canAddGroup = true;
           }
-        } else if ($('#groups').val().split(',').indexOf(prevTerm) === -1) {
-          prevTerm = query.term;
-          canAddGroup = true;
-        }
 
-        url += '/' + (canAddGroup ? 'true' : '');
-      }
+          url += '/' + (canAddGroup ? 'true' : '');
+        }
 
-      $.ajax({ url: url, success: function (data) {
-        var groups = { results: [] };
-        $.each(data, function (index, group) {
-          groups.results.push({ id: group, text: group });
-        });
-        query.callback(groups);
+        $.ajax({ url: url, success: function (data) {
+          var groups = { results: [] };
+          $.each(data, function (index, group) {
+            groups.results.push({ id: group, text: group });
+          });
+          query.callback(groups);
+        }});
       }});
-  }});
-  $('#groups').select2('data', preload_data);
-});
-    </script>
+    $('#groups').select2('data', preload_data);
+  });
+</script>
 {{/isLib}}
 <div class="content-box">
   <section class="sr-section">
-
     <h1 class="sr-script-title">About {{name}}</h1>
-
-    <button class="install-button" title="Install"
-	    type="button" onclick="location.href='{{{install}}}'" >
+    <button class="install-button" title="Install" type="button" onclick="location.href='{{{install}}}'">
       {{#isLib}}Raw{{/isLib}}{{^isLib}}Install{{/isLib}}
     </button>
-    <button class="view-source-button" title="View Source"
-	    type="button" onclick="location.href='{{{source}}}'" >
+    <button class="view-source-button" title="View Source" type="button" onclick="location.href='{{{source}}}'">
       Edit Source
     </button>
   </section>
@@ -65,10 +61,10 @@ <h1 class="sr-script-title">About {{name}}</h1>
   <form id="edit_about" action="edit" method="post">
     <strong>Use <a target="_blank" href="https://help.github.com/articles/github-flavored-markdown">GitHub Flavored Markdown</a> for formatting.</strong><br />
     <textarea class="indent" id="about" name="about" rows="20" style="width: 60%;">{{about}}</textarea><br /><br />
-{{^isLib}}
+    {{^isLib}}
     <h3>Script Groups</h3>
     <input type="hidden" id="groups" name="groups" style="width:300px" /><br /><br />
-{{/isLib}}
+    {{/isLib}}
     <strong>Delete Script:</strong>&nbsp;<input type="checkbox" name="remove" />
     <br /><br /><input type="submit" value="Save" /><br /><br />
   </form>
diff --git a/views/scriptsList.html b/views/scriptsList.html
index 5220e35c3..eff4b7461 100644
--- a/views/scriptsList.html
+++ b/views/scriptsList.html
@@ -36,7 +36,6 @@
       {{/moderation}}
       {{/edit}}
       <h2 class="script-title"><a class="script-title-anchor" href="{{{url}}}">{{name}}{{#version}} - {{version}}{{/version}}</a></h2>
-
       <table class="meta-table" width="100%">
         <tr class="home-row">
           <td class="home-col1">{{#hasAuthor}}Author: <a class="author-link" href="/users/{{author}}">{{author}}</a>{{/hasAuthor}}</td>
diff --git a/views/user.html b/views/user.html
index 1a29c9df3..bde142e6d 100644
--- a/views/user.html
+++ b/views/user.html
@@ -1,54 +1,50 @@
 {{> header.html}}
 {{#isMod}}
 <div class="centered-content moderator-box">
-		<h1 class="pop-scripts-header mod-header">OpenUserJS Moderator Areas: </h1>
-
-	    <a class="button-anchor" href="/flagged">
-	      <button id="flagged-button" class="sr-button sr-install-button" title="Flagged" type="button">
-	        Flagged
-	      </button>
-	    </a>
-	    <a class="button-anchor" href="/graveyard">
-	      <button id="graveyard-button" class="sr-button sr-install-button" title="Graveyard" type="button">
-	        Graveyard
-	      </button>
-	    </a>
+  <h1 class="pop-scripts-header mod-header">OpenUserJS Moderator Areas: </h1>
+  <a class="button-anchor" href="/flagged">
+    <button id="flagged-button" class="sr-button sr-install-button" title="Flagged" type="button">
+      Flagged
+    </button>
+  </a>
+  <a class="button-anchor" href="/graveyard">
+    <button id="graveyard-button" class="sr-button sr-install-button" title="Graveyard" type="button">
+      Graveyard
+    </button>
+  </a>
 </div>
 {{/isMod}}
-
 <div class="centered-content">
-  <h1 class="pop-scripts-header mod-header">{{name}}</h1> 
-  	{{#isYou}}
-  	<a href="/user/edit">	      
-  		<button id="user-edit" class="sr-button sr-install-button" title="Graveyard" type="button">
-	        Edit Mode
-	     </button>
-	</a>
-	 {{/isYou}}
-	 
+  <h1 class="pop-scripts-header mod-header">{{name}}</h1>
+  {{#isYou}}
+  <a href="/user/edit">
+    <button id="user-edit" class="sr-button sr-install-button" title="Graveyard" type="button">
+      Edit Mode
+    </button>
+  </a>
+  {{/isYou}}
   {{#flaggable}}
-	    <a class="button-anchor" href="{{{flagUrl}}}">
-	      <button class="sr-flag-button user-flag" title="{{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}"
-		      type="button">
-	    {{#flagged}}<img src="/images/red-flag.png"/>{{/flagged}}{{^flagged}}<img src="/images/white-flag.png"/>{{/flagged}}
-	      </button>
-	    </a>
+  <a class="button-anchor" href="{{{flagUrl}}}">
+    <button class="sr-flag-button user-flag" title="{{#flagged}}Unflag{{/flagged}}{{^flagged}}Flag{{/flagged}}" type="button">
+      {{#flagged}}<img src="/images/red-flag.png" />{{/flagged}}{{^flagged}}<img src="/images/white-flag.png" />{{/flagged}}
+    </button>
+  </a>
   {{/flaggable}}
 </div>
 <div class="content-box user-about">
-	<div class="about-content">
-		  <span class="about-header"><strong>About {{name}}</strong></span>
-		  <div class="user-content">
-		  {{{about}}}
-		  </div>
-		  {{#moderation}}
-		  <br /><br /><strong>Moderation</strong><br /><br />
-		  Flags = {{flags}} | Threshold = {{threshold}}  | <a href="{{{removeUrl}}}">Remove This User?</a>
-		  {{/moderation}}
-	</div>
+  <div class="about-content">
+    <span class="about-header"><strong>About {{name}}</strong></span>
+    <div class="user-content">
+      {{{about}}}
+    </div>
+    {{#moderation}}
+    <br /><br /><strong>Moderation</strong><br /><br />
+    Flags = {{flags}} | Threshold = {{threshold}}  | <a href="{{{removeUrl}}}">Remove This User?</a>
+    {{/moderation}}
+  </div>
 </div>
 <br /><br />
 <div class="centered-content">
-{{> scriptsList.html}}
+  {{> scriptsList.html}}
 </div>
 {{> footer.html}}
diff --git a/views/userAdmin.html b/views/userAdmin.html
index 4c74cb8b1..034ee55a2 100644
--- a/views/userAdmin.html
+++ b/views/userAdmin.html
@@ -1,26 +1,25 @@
 <html>
 <head>
-<title>User Administration</title>
+  <title>User Administration</title>
 </head>
 <body>
-{{^user}}
-<form method="post" action="/admin/user/update">
-{{#users}}
-  <strong><a href="/admin/user/{{{id}}}">{{name}}</a></strong> | Role:
-  <select name="user[{{{id}}}]">
-    {{#roles}}
-    <option value="{{{val}}}" {{#selected}}selected="{{selected}}"{{/selected}}>
-      {{display}}</option>
-    {{/roles}}
-  </select> | Remove: 
-  <input type="checkbox" name="remove[{{{id}}}]" value=""><br />
-{{/users}}
-<input type="submit" value="Update" />
-</form>
-{{/user}}
-{{#user}}
-<pre>{{{info}}}</pre>
-{{/user}}
+  {{^user}}
+  <form method="post" action="/admin/user/update">
+    {{#users}}
+    <strong><a href="/admin/user/{{{id}}}">{{name}}</a></strong> | Role:
+    <select name="user[{{{id}}}]">
+      {{#roles}}
+      <option value="{{{val}}}" {{#selected}}selected="{{selected}}"{{/selected}}>{{display}}</option>
+      {{/roles}}
+    </select> | Remove:
+    <input type="checkbox" name="remove[{{{id}}}]" value=""><br />
+    {{/users}}
+    <input type="submit" value="Update" />
+  </form>
+  {{/user}}
+  {{#user}}
+  <pre>{{{info}}}</pre>
+  {{/user}}
 </body>
 </html>
 <html>
diff --git a/views/usersList.html b/views/usersList.html
index 2fd3280fe..d5574e6f7 100644
--- a/views/usersList.html
+++ b/views/usersList.html
@@ -4,15 +4,14 @@
   <ul class="scripts-list">
     <li class="script">
       {{#moderation}}
-      <button class="install-button" title="Remove"
-	      type="button" onclick="location.href='/remove{{{url}}}'" >
-	Remove
+      <button class="install-button" title="Remove" type="button" onclick="location.href='/remove{{{url}}}'">
+        Remove
       </button>
       {{/moderation}}
       <h2 class="script-title"><a href="{{{url}}}">{{name}}</a></h2>
     </li>
   </ul>
-{{/users}}
+  {{/users}}
   <br />
   {{> pagination.html}}
 </section>

From 4720f4c396df611d8b798580aff3ed054de9b38e Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 19:17:03 +0200
Subject: [PATCH 10/14] * Consistency; * Removed one unused variable;

---
 app.js | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/app.js b/app.js
index dc4b24632..85154f118 100755
--- a/app.js
+++ b/app.js
@@ -17,31 +17,31 @@ var group = require('./controllers/group');
 var discussion = require('./controllers/discussion');
 var issue = require('./controllers/issue');
 var scriptStorage = require('./controllers/scriptStorage');
-var statusCodePage = require('./libs/templateHelpers').statusCodePage;
-
-var modelParser = require('./libs/modelParser');
 
+var statusCodePage = require('./libs/templateHelpers').statusCodePage;
 var modifySessions = require('./libs/modifySessions');
+
 var settings = require('./models/settings.json');
+
 var connectStr = process.env.CONNECT_STRING || settings.connect;
 var sessionSecret = process.env.SESSION_SECRET || settings.secret;
 var db = mongoose.connection;
-var dbOptions = { server : { socketOptions : { keepAlive: 1 } } };
+var dbOptions = { server: { socketOptions: { keepAlive: 1 } } };
 
 app.set('port', process.env.PORT || 8080);
 
 // Connect to the database
 mongoose.connect(connectStr, dbOptions);
 db.on('error', console.error.bind(console, 'connection error:'));
-db.once('open', function () {
+db.once('open', function() {
   app.listen(app.get('port'));
 });
 
-app.configure(function(){
+app.configure(function() {
   var sessionStore = new MongoStore({ mongoose_connection: db });
 
   // See https://hacks.mozilla.org/2013/01/building-a-node-js-server-that-wont-melt-a-node-js-holiday-season-part-5/
-  app.use(function (req, res, next) {
+  app.use(function(req, res, next) {
     // check if we're toobusy
     if (toobusy()) {
       statusCodePage(req, res, next, {
@@ -55,13 +55,12 @@ app.configure(function(){
 
   // Force HTTPS
   if (app.get('port') === 443) {
-    app.use(function (req, res, next) {
+    app.use(function(req, res, next) {
       res.setHeader('Strict-Transport-Security',
         'max-age=8640000; includeSubDomains');
 
       if (req.headers['x-forwarded-proto'] !== 'https') {
-        return res.redirect(301, 'https://' + req.headers.host
-          + encodeURI(req.url));
+        return res.redirect(301, 'https://' + req.headers.host + encodeURI(req.url));
       }
 
       next();
@@ -94,7 +93,7 @@ app.configure(function(){
 });
 
 // Build the route regex for model lists
-function listRegex (root, type) {
+function listRegex(root, type) {
   var slash = '\/';
   if (root === slash) { slash = ''; }
   return new RegExp('^' + root +
@@ -113,7 +112,7 @@ function app_route(path) {
   r.all = function(cb) {
     app.all.call(app, path, cb);
   };
-  methods.forEach(function(method){
+  methods.forEach(function(method) {
     r[method] = function(cb) {
       app[method].call(app, path, cb);
       return r;
@@ -151,7 +150,6 @@ app_route('/user/add/lib/new').get(script.lib(user.editScript)).post(script.lib(
 app_route('/user/add/scripts/upload').post(user.uploadScript);
 app_route('/user/add/lib/upload').post(script.lib(user.uploadScript));
 
-
 // Script routes
 app_route('/scripts/:username/:namespace?/:scriptname').get(script.view);
 app_route('/script/:username/:namespace?/:scriptname/edit').get(script.edit).post(script.edit);
@@ -166,7 +164,7 @@ app.get('/meta/:username/:namespace/:scriptname', scriptStorage.sendMeta);
 app.get('/vote/scripts/:username/:scriptname/:vote', script.vote);
 app.get('/vote/scripts/:username/:namespace/:scriptname/:vote', script.vote);
 app.post('/github/hook', scriptStorage.webhook);
-app.post('/github/service', function (req, res, next) { next(); });
+app.post('/github/service', function(req, res, next) { next(); });
 
 // Library routes
 app.get(listRegex('\/toolbox', 'lib'), main.toolbox);
@@ -181,7 +179,7 @@ app.get(listRegex('\/use\/lib\/([^\/]+?)\/([^\/]+?)', 'script'), script.useLib);
 
 // Issues routes
 app_route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:open(closed)?').get(issue.list);
-// app_route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:topic').get(issue.view);
+//app_route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:topic').get(issue.view);
 app_route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issue/new').get(issue.open).post(issue.open);
 app_route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:topic').get(issue.view);
 
@@ -205,9 +203,8 @@ app_route('/mod/removed/:id').get(moderation.removedItemPage);
 app.get('/flag/users/:username/:unflag?', user.flag);
 app.get('/flag/scripts/:username/:namespace/:scriptname/:unflag?', script.flag);
 app.get('/flag/scripts/:username/:scriptname/:unflag?', script.flag);
-app.get('/flag/libs/:username/:scriptname/:unflag?', script.lib(script.flag)); //
-app.get(listRegex('\/flagged(?:\/([^\/]+?))?', 'user|script'),
-  moderation.flagged); //
+app.get('/flag/libs/:username/:scriptname/:unflag?', script.lib(script.flag));
+app.get(listRegex('\/flagged(?:\/([^\/]+?))?', 'user|script'), moderation.flagged);
 app.get(listRegex('\/graveyard(?:\/([^\/]+?))?', ''), moderation.graveyard);
 app.get(/^\/remove\/(.+?)\/(.+)$/, remove.rm);
 
@@ -234,10 +231,9 @@ app.get(listRegex('\/', 'script'), main.home);
 
 // Fallback routes
 app.use(express.static(__dirname + '/public'));
-app.use(function (req, res, next) {
+app.use(function(req, res, next) {
   statusCodePage(req, res, next, {
     statusCode: 404,
     statusMessage: 'This is not the page you\'re are looking for.',
   });
 });
-

From 3a780f2e3f686e80ed32274d91cab549677b7196 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 19:55:24 +0200
Subject: [PATCH 11/14] Consistency;

---
 controllers/_template.js     |  29 ++--
 controllers/admin.js         |  93 +++++------
 controllers/auth.js          |  74 +++++----
 controllers/discussion.js    |  52 +++----
 controllers/group.js         |  65 ++++----
 controllers/index.js         |  74 ++++-----
 controllers/issue.js         | 140 ++++++++---------
 controllers/moderation.js    |  68 ++++----
 controllers/remove.js        |  44 +++---
 controllers/script.js        | 114 +++++++-------
 controllers/scriptStorage.js |  72 ++++-----
 controllers/user.js          | 290 ++++++++++++++++++-----------------
 12 files changed, 568 insertions(+), 547 deletions(-)

diff --git a/controllers/_template.js b/controllers/_template.js
index 42f414084..399492681 100644
--- a/controllers/_template.js
+++ b/controllers/_template.js
@@ -16,9 +16,8 @@ var modelQuery = require('../libs/modelQuery');
 // Generate a bootstrap3 pagination widget.
 var getDefaultPagination = require('../libs/templateHelpers').getDefaultPagination;
 
-
 //--- Views
-exports.example = function (req, res, next) {
+exports.example = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -38,16 +37,15 @@ exports.example = function (req, res, next) {
   options.pageMetaKeywords = pageMetaKeywords.join(', ');
 
   //--- Tasks
-  // ...
 
   //---
-  function preRender(){};
-  function render(){ res.render('pages/_templatePage', options); }
-  function asyncComplete(){ preRender(); render(); }
+  function preRender() { };
+  function render() { res.render('pages/_templatePage', options); }
+  function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);
 };
 
-exports.example = function (req, res, next) {
+exports.example = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -70,17 +68,16 @@ exports.example = function (req, res, next) {
   var scriptListQuery = Script.find();
 
   // Scripts: Query: isLib=false
-  scriptListQuery.find({isLib: false});
+  scriptListQuery.find({ isLib: false });
 
   // Scripts: Query: Search
   if (req.query.q)
     modelQuery.parseScriptSearchQuery(scriptListQuery, req.query.q);
 
   // Scripts: Query: Sort
-  modelQuery.parseModelListSort(scriptListQuery, req.query.orderBy, req.query.orderDir, function(){
+  modelQuery.parseModelListSort(scriptListQuery, req.query.orderBy, req.query.orderDir, function() {
     scriptListQuery.sort('-rating -installs -updated');
   });
-  
 
   // Pagination
   var pagination = getDefaultPagination(req);
@@ -90,10 +87,10 @@ exports.example = function (req, res, next) {
 
   // Pagination
   tasks.push(pagination.getCountTask(scriptListQuery));
-  
+
   // Scripts
-  tasks.push(function (callback) {
-    scriptListQuery.exec(function(err, scriptDataList){
+  tasks.push(function(callback) {
+    scriptListQuery.exec(function(err, scriptDataList) {
       if (err) {
         callback();
       } else {
@@ -104,12 +101,12 @@ exports.example = function (req, res, next) {
   });
 
   //---
-  function preRender(){
+  function preRender() {
     // Pagination
     options.paginationRendered = pagination.renderDefault(req);
   };
-  function render(){ res.render('pages/_templatePage', options); }
-  function asyncComplete(){ preRender(); render(); }
+  function render() { res.render('pages/_templatePage', options); }
+  function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);
 };
 
diff --git a/controllers/admin.js b/controllers/admin.js
index c513149ac..160b81af1 100644
--- a/controllers/admin.js
+++ b/controllers/admin.js
@@ -34,7 +34,7 @@ function getOAuthStrategies(stored) {
     strategy = strategies[type];
     if (strategy.oauth) {
       oAuthStrats.push(stored[type] ||
-        nil({ 'strat' : type, 'id' : '', 'key' : ''}));
+        nil({ 'strat': type, 'id': '', 'key': '' }));
     }
   }
 
@@ -42,28 +42,33 @@ function getOAuthStrategies(stored) {
 }
 
 // Allow admins to set user roles and delete users
-exports.userAdmin = function (req, res, next) {
+exports.userAdmin = function(req, res, next) {
   var options = nil();
   var thisUser = req.session.user;
 
   if (!userIsAdmin(req)) { return next(); }
 
   // You can only see users with a role less than yours
-  User.find({ role : { $gt: thisUser.role } }, function (err, users) {
+  User.find({ role: { $gt: thisUser.role } }, function(err, users) {
     var i = 0;
     options.users = [];
 
-    users.forEach(function (user) {
+    users.forEach(function(user) {
       var roles = [];
-      userRoles.forEach(function (role, index) {
-        roles.push({ 'val' : index, 'display' : role,
-          'selected' : index === user.role });
+      userRoles.forEach(function(role, index) {
+        roles.push({
+          'val': index, 'display': role,
+          'selected': index === user.role
+        });
       });
       roles = roles.splice(thisUser.role + 1);
       roles.reverse();
 
-      options.users.push({ 'id' : user._id, 'name' : user.name,
-        'roles' : roles });
+      options.users.push({
+        'id': user._id,
+        'name': user.name,
+        'roles': roles
+      });
     });
 
     res.render('userAdmin', options);
@@ -72,23 +77,25 @@ exports.userAdmin = function (req, res, next) {
 
 // View everything about a particular user
 // This is mostly for debugging in production
-exports.adminUserView = function (req, res, next) {
+exports.adminUserView = function(req, res, next) {
   var id = req.route.params.id;
   var thisUser = req.session.user;
 
   if (!userIsAdmin(req)) { return next(); }
 
   // Nothing fancy, just the stringified user object
-  User.findOne({ '_id' : id, role : { $gt: thisUser.role } },
-    function (err, user) {
+  User.findOne({ '_id': id, role: { $gt: thisUser.role } },
+    function(err, user) {
       if (err || !user) { return next(); }
 
-      res.render('userAdmin', { user: {
-        info: JSON.stringify(user.toObject(), null, ' ') } });
-  });
+      res.render('userAdmin', {
+        user: {
+          info: JSON.stringify(user.toObject(), null, ' ')
+        }
+      });
+    });
 };
 
-
 var jsonModelMap = {
   'User': User,
   'Script': Script,
@@ -100,7 +107,7 @@ var jsonModelMap = {
 };
 // View everything about a particular user
 // This is mostly for debugging in production
-exports.adminJsonView = function (req, res, next) {
+exports.adminJsonView = function(req, res, next) {
   var authedUser = req.session.user;
 
   var modelname = req.query.model;
@@ -115,32 +122,31 @@ exports.adminJsonView = function (req, res, next) {
   options.isAdmin = authedUser && authedUser.isAdmin;
 
   if (!options.isAdmin)
-    return res.send(403, {status: 403, message: 'Not an admin.'});
-
+    return res.send(403, { status: 403, message: 'Not an admin.' });
 
   var model = jsonModelMap[modelname];
   if (!model)
-    return res.send(400, {status: 400, message: 'Invalid model.'});
+    return res.send(400, { status: 400, message: 'Invalid model.' });
 
   model.findOne({
     _id: id
-  }, function(err, obj){
+  }, function(err, obj) {
     if (err || !obj)
-      return res.send(404, {status: 404, message: 'Id doesn\'t exist.'});
+      return res.send(404, { status: 404, message: 'Id doesn\'t exist.' });
 
     res.json(obj);
   });
 };
 
 // Make changes to users listed
-exports.adminUserUpdate = function (req, res, next) {
+exports.adminUserUpdate = function(req, res, next) {
   var authedUser = req.session.user;
 
   var username = req.route.params.username;
 
   User.findOne({
     name: username
-  }, function (err, userData) {
+  }, function(err, userData) {
     if (err || !userData) { return next(); }
 
     //
@@ -185,7 +191,7 @@ exports.adminUserUpdate = function (req, res, next) {
       }
 
       // Make sure the change is reflected in the session store
-      updateSessions(req, userData, function (err, sess) {
+      updateSessions(req, userData, function(err, sess) {
         res.redirect(user.userPageUrl);
       });
     });
@@ -193,7 +199,7 @@ exports.adminUserUpdate = function (req, res, next) {
 };
 
 // Landing Page for admins
-exports.adminPage = function (req, res, next) {
+exports.adminPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -218,14 +224,14 @@ exports.adminPage = function (req, res, next) {
   options.pageMetaKeywords = null;
 
   //---
-  async.parallel(tasks, function(err){
+  async.parallel(tasks, function(err) {
     if (err) return next();
     res.render('pages/adminPage', options);
   });
 };
 
 // This page allows admins to set oAuth keys for the available authenticators
-exports.adminApiKeysPage = function (req, res, next) {
+exports.adminApiKeysPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -252,12 +258,12 @@ exports.adminApiKeysPage = function (req, res, next) {
   //--- Tasks
 
   // strategyListQuery
-  tasks.push(function(callback){
-    Strategy.find({}, function (err, strats) {
+  tasks.push(function(callback) {
+    Strategy.find({}, function(err, strats) {
       var stored = nil();
       var strategies = null;
 
-      strats.forEach(function (strat) {
+      strats.forEach(function(strat) {
         stored[strat.name] = {
           strat: strat.name,
           id: strat.id,
@@ -273,7 +279,7 @@ exports.adminApiKeysPage = function (req, res, next) {
   });
 
   //---
-  async.parallel(tasks, function(err){
+  async.parallel(tasks, function(err) {
     if (err) return next();
     res.render('pages/adminApiKeysPage', options);
   });
@@ -282,30 +288,30 @@ exports.adminApiKeysPage = function (req, res, next) {
 // Manage oAuth strategies without having to restart the server
 // When new keys are added, we load the new strategy
 // When keys are removed, we remove the strategy
-exports.apiAdminUpdate = function (req, res, next) {
+exports.apiAdminUpdate = function(req, res, next) {
   var postStrats = null;
 
   if (!userIsAdmin(req)) { return next(); }
 
-  postStrats = Object.keys(req.body).map(function (postStrat) {
+  postStrats = Object.keys(req.body).map(function(postStrat) {
     var values = req.body[postStrat];
     return { name: postStrat, id: values[0], key: values[1] }
   });
 
-  Strategy.find({}, function (err, strats) {
+  Strategy.find({}, function(err, strats) {
     var stored = nil();
 
     strats.forEach(function(strat) {
       stored[strat.name] = strat;
     });
-    async.each(postStrats, function (postStrat, cb) {
+    async.each(postStrats, function(postStrat, cb) {
       var strategy = null;
       var name = postStrat.name;
       var id = postStrat.id;
       var key = postStrat.key;
 
       if (stored[name] && !id && !key) {
-        stored[name].remove(function () {
+        stored[name].remove(function() {
           delete strategyInstances[name];
           cb();
         });
@@ -317,22 +323,21 @@ exports.apiAdminUpdate = function (req, res, next) {
           strategy.key = key;
         } else {
           strategy = new Strategy({
-            'id' : id,
-            'key' : key,
-            'name' : name,
-            'display' : strategies[name].name
+            'id': id,
+            'key': key,
+            'name': name,
+            'display': strategies[name].name
           });
         }
 
-
-        return strategy.save(function (err, strategy) {
+        return strategy.save(function(err, strategy) {
           loadPassport(strategy);
           cb();
         });
       }
 
       cb();
-    }, function (err) {
+    }, function(err) {
       res.redirect('/admin/api');
     });
   });
diff --git a/controllers/auth.js b/controllers/auth.js
index a112e227e..3d15fe3a7 100644
--- a/controllers/auth.js
+++ b/controllers/auth.js
@@ -10,29 +10,29 @@ var cleanFilename = require('../libs/helpers').cleanFilename;
 var addSession = require('../libs/modifySessions').add;
 
 // Unused but removing it breaks passport
-passport.serializeUser(function (user, done) {
+passport.serializeUser(function(user, done) {
   done(null, user._id);
 });
 
 // Setup all our auth strategies
 var openIdStrategies = {};
-Strategy.find({}, function (err, strategies) {
+Strategy.find({}, function(err, strategies) {
 
   // Get OpenId strategies
   for (var name in allStrategies) {
     if (!allStrategies[name].oauth) {
       openIdStrategies[name] = true;
-      strategies.push({ 'name' : name, 'openid' : true });
+      strategies.push({ 'name': name, 'openid': true });
     }
   }
 
   // Load the passport module for each strategy
-  strategies.forEach(function (strategy) {
+  strategies.forEach(function(strategy) {
     loadPassport(strategy);
   });
 });
 
-exports.auth = function (req, res, next) {
+exports.auth = function(req, res, next) {
   var user = req.session.user;
   var strategy = req.body.auth || req.route.params.strategy;
   var username = req.body.username || req.session.username;
@@ -68,8 +68,8 @@ exports.auth = function (req, res, next) {
     req.session.username = username;
   }
 
-  User.findOne({ name : { $regex : new RegExp('^' + username + '$', 'i') } },
-    function (err, user) {
+  User.findOne({ name: { $regex: new RegExp('^' + username + '$', 'i') } },
+    function(err, user) {
       var strategies = null;
       var strat = null;
 
@@ -93,10 +93,10 @@ exports.auth = function (req, res, next) {
       } else {
         return auth();
       }
-  });
+    });
 };
 
-exports.callback = function (req, res, next) {
+exports.callback = function(req, res, next) {
   var strategy = req.route.params.strategy;
   var username = req.session.username;
   var newstrategy = req.session.newstrategy;
@@ -109,55 +109,53 @@ exports.callback = function (req, res, next) {
   // Get the passport strategy instance so we can alter the _verfiy method
   strategyInstance = strategyInstances[strategy];
 
-
   // Hijak the private verify method so we can fuck shit up freely
   // We use this library for things it was never intended to do
   if (openIdStrategies[strategy]) {
-    strategyInstance._verify = function (id, done) {
+    strategyInstance._verify = function(id, done) {
       verifyPassport(id, strategy, username, req.session.user, done);
     }
   } else {
     strategyInstance._verify =
-      function (token, refreshOrSecretToken, profile, done) {
+      function(token, refreshOrSecretToken, profile, done) {
         req.session.profile = profile;
         verifyPassport(profile.id, strategy, username, req.session.user, done);
       }
   }
 
   // This callback will happen after the verify routine
-  var authenticate = passport.authenticate(strategy,
-    function (err, user, info) {
+  var authenticate = passport.authenticate(strategy, function(err, user, info) {
+    if (err) { return next(err); }
+    if (!user) {
+      return res.redirect(doneUrl + (doneUrl === '/' ? 'register' : '')
+        + '?authfail');
+    }
+
+    req.logIn(user, function(err) {
       if (err) { return next(err); }
-      if (!user) {
-        return res.redirect(doneUrl + (doneUrl === '/' ? 'register' : '')
-          + '?authfail');
-      }
 
-      req.logIn(user, function(err) {
-        if (err) { return next(err); }
+      // Store the user info in the session
+      req.session.user = user;
 
-        // Store the user info in the session
-        req.session.user = user;
+      // Save the session id on the user model
+      user.sessionId = req.sessionID;
 
-        // Save the session id on the user model
-        user.sessionId = req.sessionID;
+      // Save GitHub username.
+      if (req.session.profile && req.session.profile.provider === 'github') {
+        user.ghUsername = req.session.profile.username;
+      }
 
-        // Save GitHub username.
-        if (req.session.profile && req.session.profile.provider === 'github') {
-          user.ghUsername = req.session.profile.username;
+      addSession(req, user, function() {
+        if (newstrategy) {
+          // Allow a user to link to another acount
+          return res.redirect('/auth/' + newstrategy);
+        } else {
+          // Delete the username that was temporarily stored
+          delete req.session.username;
+          return res.redirect(doneUrl);
         }
-
-        addSession(req, user, function () {
-          if (newstrategy) {
-            // Allow a user to link to another acount
-            return res.redirect('/auth/' + newstrategy);
-          } else {
-            // Delete the username that was temporarily stored
-            delete req.session.username;
-            return res.redirect(doneUrl);
-          }
-        });
       });
+    });
   });
 
   authenticate(req, res, next);
diff --git a/controllers/discussion.js b/controllers/discussion.js
index 8db994388..a67ea44dd 100644
--- a/controllers/discussion.js
+++ b/controllers/discussion.js
@@ -27,7 +27,7 @@ var categories = [
   },
 ];
 
-exports.categoryListPage = function (req, res, next) {
+exports.categoryListPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -72,8 +72,8 @@ exports.categoryListPage = function (req, res, next) {
     //--- PreRender
     // discussionList
     options.discussionList = _.map(options.discussionList, modelParser.parseDiscussion);
-    _.map(options.discussionList, function(discussion){
-      var category = _.findWhere(categories, {slug: discussion.category});
+    _.map(options.discussionList, function(discussion) {
+      var category = _.findWhere(categories, { slug: discussion.category });
       if (!category) {
         category = {
           name: discussion.category,
@@ -102,12 +102,12 @@ exports.categoryListPage = function (req, res, next) {
 };
 
 // List discussions for one of the three categories
-exports.list = function (req, res, next) {
+exports.list = function(req, res, next) {
   var authedUser = req.session.user;
 
   var categorySlug = req.route.params.shift();
 
-  var category = _.findWhere(categories, {slug: categorySlug});
+  var category = _.findWhere(categories, { slug: categorySlug });
   if (!category)
     return next();
 
@@ -132,7 +132,7 @@ exports.list = function (req, res, next) {
   var discussionListQuery = Discussion.find();
 
   // discussionListQuery: category
-  discussionListQuery.find({category: category.slug});
+  discussionListQuery.find({ category: category.slug });
 
   // discussionListQuery: Defaults
   modelQuery.applyDiscussionListQueryDefaults(discussionListQuery, options, req);
@@ -165,7 +165,7 @@ exports.list = function (req, res, next) {
 };
 
 // Locate a discussion and deal with topic url collisions
-function findDiscussion (category, topicUrl, callback) {
+function findDiscussion(category, topicUrl, callback) {
   // To prevent collisions we add an incrementing id to the topic url
   var topic = /(.+?)(?:_(\d+))?$/.exec(topicUrl);
   var query = { path: '/' + category + '/' + topic[1] };
@@ -175,7 +175,7 @@ function findDiscussion (category, topicUrl, callback) {
     query.duplicateId = Number(topic[2]);
   }
 
-  Discussion.findOne(query, function (err, discussion) {
+  Discussion.findOne(query, function(err, discussion) {
     if (err || !discussion) { return callback(null); }
     callback(discussion);
   });
@@ -183,17 +183,17 @@ function findDiscussion (category, topicUrl, callback) {
 exports.findDiscussion = findDiscussion;
 
 // List comments in a discussion
-exports.show = function (req, res, next) {
+exports.show = function(req, res, next) {
   var authedUser = req.session.user;
 
   var categorySlug = req.route.params.shift();
   var topic = req.route.params.shift();
 
-  var category = _.findWhere(categories, {slug: categorySlug});
+  var category = _.findWhere(categories, { slug: categorySlug });
   if (!category)
     return next();
 
-  findDiscussion(category.slug, topic, function (discussionData) {
+  findDiscussion(category.slug, topic, function(discussionData) {
     if (!discussionData) { return next(); }
 
     //
@@ -220,7 +220,7 @@ exports.show = function (req, res, next) {
     var commentListQuery = Comment.find();
 
     // commentListQuery: discussion
-    commentListQuery.find({_discussionId: discussion._id});
+    commentListQuery.find({ _discussionId: discussion._id });
 
     // commentListQuery: Defaults
     modelQuery.applyCommentListQueryDefaults(commentListQuery, options, req);
@@ -243,7 +243,7 @@ exports.show = function (req, res, next) {
       //--- PreRender
       // commentList
       options.commentList = _.map(options.commentList, modelParser.parseComment);
-      _.map(options.commentList, function(comment){
+      _.map(options.commentList, function(comment) {
         comment.author = modelParser.parseUser(comment._authorId);
       });
       _.map(options.commentList, modelParser.renderComment);
@@ -258,7 +258,7 @@ exports.show = function (req, res, next) {
 };
 
 // UI to create a new topic
-exports.newTopic = function (req, res, next) {
+exports.newTopic = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser)
@@ -266,7 +266,7 @@ exports.newTopic = function (req, res, next) {
 
   var categorySlug = req.route.params.category;
 
-  var category = _.findWhere(categories, {slug: categorySlug});
+  var category = _.findWhere(categories, { slug: categorySlug });
   if (!category)
     return next();
 
@@ -291,7 +291,7 @@ exports.newTopic = function (req, res, next) {
 };
 
 // Does all the work of submitting a new comment and updating the discussion
-function postComment (user, discussion, content, creator, callback) {
+function postComment(user, discussion, content, creator, callback) {
   var created = new Date();
   var comment = new Comment({
     content: content,
@@ -306,7 +306,7 @@ function postComment (user, discussion, content, creator, callback) {
     _authorId: user._id
   });
 
-  comment.save(function (err, comment) {
+  comment.save(function(err, comment) {
     ++discussion.comments;
     discussion.lastCommentor = user.name;
     discussion.updated = new Date();
@@ -317,7 +317,7 @@ exports.postComment = postComment;
 
 // Does all the work of submitting a new topic and
 // resolving topic url collisions
-function postTopic (user, category, topic, content, issue, callback) {
+function postTopic(user, category, topic, content, issue, callback) {
   var urlTopic = cleanFilename(topic, '').replace(/_\d+$/, '');
   var path = '/' + category + '/' + urlTopic;
   var params = { sort: {} };
@@ -325,7 +325,7 @@ function postTopic (user, category, topic, content, issue, callback) {
 
   if (!urlTopic) { callback(null); }
 
-  Discussion.findOne({ path: path }, params, function (err, discussion) {
+  Discussion.findOne({ path: path }, params, function(err, discussion) {
     var newDiscussion = null;
     var props = {
       topic: topic,
@@ -356,9 +356,9 @@ function postTopic (user, category, topic, content, issue, callback) {
 
     newDiscussion = new Discussion(props);
 
-    newDiscussion.save(function (err, discussion) {
+    newDiscussion.save(function(err, discussion) {
       // Now post the first comment
-      postComment(user, discussion, content, true, function (err, discussion) {
+      postComment(user, discussion, content, true, function(err, discussion) {
         callback(discussion);
       });
     });
@@ -367,7 +367,7 @@ function postTopic (user, category, topic, content, issue, callback) {
 exports.postTopic = postTopic;
 
 // post route to create a new topic
-exports.createTopic = function (req, res, next) {
+exports.createTopic = function(req, res, next) {
   var user = req.session.user;
   var category = req.route.params.category;
   var topic = req.body['discussion-topic'];
@@ -375,7 +375,7 @@ exports.createTopic = function (req, res, next) {
 
   if (!user) { return next(); }
 
-  postTopic(user, category, topic, content, false, function (discussion) {
+  postTopic(user, category, topic, content, false, function(discussion) {
     if (!discussion) { return exports.newTopic(req, res, next); }
 
     res.redirect(encodeURI(discussion.path
@@ -384,7 +384,7 @@ exports.createTopic = function (req, res, next) {
 };
 
 // post route to create a new comment on an existing discussion
-exports.createComment = function (req, res, next) {
+exports.createComment = function(req, res, next) {
   var category = req.route.params.category;
   var topic = req.route.params.topic;
   var user = req.session.user;
@@ -393,10 +393,10 @@ exports.createComment = function (req, res, next) {
 
   if (!user) { return next(); }
 
-  findDiscussion(category, topic, function (discussion) {
+  findDiscussion(category, topic, function(discussion) {
     if (!discussion) { return next(); }
 
-    postComment(user, discussion, content, false, function (err, discussion) {
+    postComment(user, discussion, content, false, function(err, discussion) {
       res.redirect(encodeURI(discussion.path
         + (discussion.duplicateId ? '_' + discussion.duplicateId : '')));
     });
diff --git a/controllers/group.js b/controllers/group.js
index cbe7c7afd..26ece079f 100644
--- a/controllers/group.js
+++ b/controllers/group.js
@@ -12,13 +12,13 @@ var getRating = require('../libs/collectiveRating').getRating;
 var execQueryTask = require('../libs/tasks').execQueryTask;
 
 // clean the name of the group so it is url safe
-function cleanGroupName (name) {
+function cleanGroupName(name) {
   return cleanFilename(name, '').replace(/_/g, ' ')
     .replace(/^\s+|\s+$/g, '').replace(/,/g, '');
 }
 
 // api for the client side javascript select2 library
-exports.search = function (req, res) {
+exports.search = function(req, res) {
   var queryStr = '';
   var queryRegex = null;
   var addTerm = req.route.params.addTerm;
@@ -31,15 +31,15 @@ exports.search = function (req, res) {
     return res.end(JSON.stringify([]));
   }
 
-  terms.forEach(function (term) {
-    queryStr += '(?=.*?' + term  + ')';
+  terms.forEach(function(term) {
+    queryStr += '(?=.*?' + term + ')';
   });
   queryRegex = new RegExp(queryStr, 'i');
 
-  Group.find({ name: queryRegex }, 'name', function (err, groups) {
+  Group.find({ name: queryRegex }, 'name', function(err, groups) {
     if (err) { groups = []; }
 
-    results = groups.map(function (group) {
+    results = groups.map(function(group) {
       return group.name;
     });
 
@@ -52,12 +52,12 @@ exports.search = function (req, res) {
 };
 
 // When the select2 library submits
-exports.addScriptToGroups = function (script, groupNames, callback) {
+exports.addScriptToGroups = function(script, groupNames, callback) {
   if (script.isLib || !groupNames || groupNames[0].length === 0) {
     return script.save(callback);
   }
 
-  Group.find({ name: { $in: groupNames } }, function (err, groups) {
+  Group.find({ name: { $in: groupNames } }, function(err, groups) {
     var existingNames = null;
     var newGroup = null;
     var tasks = [];
@@ -67,23 +67,23 @@ exports.addScriptToGroups = function (script, groupNames, callback) {
     // Groups to add the script to
     // This could have been added to the above query but
     // We need to figure out which groups don't exist as well (see below)
-    existingGroups = groups.filter(function (group) {
+    existingGroups = groups.filter(function(group) {
       return group._scriptIds.indexOf(script._id) === -1;
     });
 
     // Names of existing groups
-    existingNames = groups.map(function (group) {
-        return group.name;
+    existingNames = groups.map(function(group) {
+      return group.name;
     });
 
     // Name of a group that doesn't exist
-    newGroup = cleanGroupName(groupNames.filter(function (name) {
+    newGroup = cleanGroupName(groupNames.filter(function(name) {
       return existingNames.indexOf(name) === -1;
     }).shift());
 
     // Add script to exising groups
-    tasks.push(function (cb) {
-      async.each(existingGroups, function (group, innerCb) {
+    tasks.push(function(cb) {
+      async.each(existingGroups, function(group, innerCb) {
         group._scriptIds.push(script._id);
         group.update = new Date();
         group.save(innerCb);
@@ -92,7 +92,7 @@ exports.addScriptToGroups = function (script, groupNames, callback) {
 
     // Create a custom group for the script
     if (!script._groupId && newGroup) {
-      tasks.push(function (cb) {
+      tasks.push(function(cb) {
         var group = new Group({
           name: newGroup,
           rating: 0,
@@ -100,33 +100,34 @@ exports.addScriptToGroups = function (script, groupNames, callback) {
           _scriptIds: [script._id]
         });
 
-        group.save(function (err, group) {
+        group.save(function(err, group) {
           script._groupId = group._id;
           cb();
         });
       });
     }
 
-    async.parallel(tasks, function () {
+    async.parallel(tasks, function() {
       script.save(callback);
 
       // Update the group ratings in the background
-      groups.forEach(function (group) {
+      groups.forEach(function(group) {
         Script.find({ _id: { $in: group._scriptIds } },
-          function (err, scripts) {
+          function(err, scripts) {
             if (err || scripts.length < 2) { return; }
 
             group.rating = getRating(scripts);
             group.updated = new Date();
-            group.save(function () {});
-        });
+            group.save(function() { });
+          }
+        );
       });
     });
   });
 };
 
 // list groups
-exports.list = function (req, res) {
+exports.list = function(req, res) {
   var authedUser = req.session.user;
 
   //
@@ -170,7 +171,7 @@ exports.list = function (req, res) {
   tasks.push(execQueryTask(popularGroupListQuery, options, 'popularGroupList'));
 
   //---
-  function preRender(){
+  function preRender() {
     // groupList
     options.groupList = _.map(options.groupList, modelParser.parseGroup);
 
@@ -186,8 +187,8 @@ exports.list = function (req, res) {
       pageMetaKeywords.concat(_.pluck(options.groupList, 'name'));
     options.pageMetaKeywords = pageMetaKeywords.join(', ');
   };
-  function render(){ res.render('pages/groupListPage', options); }
-  function asyncComplete(){ preRender(); render(); }
+  function render() { res.render('pages/groupListPage', options); }
+  function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);
 };
 
@@ -208,7 +209,7 @@ var setupGroupSidePanel = function(options) {
 };
 
 // list the scripts in a group
-exports.view = function (req, res, next) {
+exports.view = function(req, res, next) {
   var authedUser = req.session.user;
 
   var groupNameSlug = req.route.params.groupname;
@@ -216,7 +217,7 @@ exports.view = function (req, res, next) {
 
   Group.findOne({
     name: groupName
-  }, function (err, groupData) {
+  }, function(err, groupData) {
     if (err || !groupData) { return next(); }
 
     // Don't show page if we have no scripts assigned to it yet.
@@ -241,10 +242,10 @@ exports.view = function (req, res, next) {
     var scriptListQuery = Script.find();
 
     // scriptListQuery: script in group
-    scriptListQuery.find({_id: {$in: group._scriptIds}});
+    scriptListQuery.find({ _id: { $in: group._scriptIds } });
 
     // scriptListQuery: isLib=false
-    scriptListQuery.find({isLib: false});
+    scriptListQuery.find({ isLib: false });
 
     // scriptListQuery: Defaults
     modelQuery.applyScriptListQueryDefaults(scriptListQuery, options, req);
@@ -273,7 +274,7 @@ exports.view = function (req, res, next) {
     tasks.push(execQueryTask(popularGroupListQuery, options, 'popularGroupList'));
 
     //---
-    function preRender(){
+    function preRender() {
       // scriptList
       options.scriptList = _.map(options.scriptList, modelParser.parseScript);
 
@@ -289,8 +290,8 @@ exports.view = function (req, res, next) {
         pageMetaKeywords.push(group.name);
       options.pageMetaKeywords = pageMetaKeywords.join(', ');
     };
-    function render(){ res.render('pages/groupScriptListPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function render() { res.render('pages/groupScriptListPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
diff --git a/controllers/index.js b/controllers/index.js
index 0b4b449b2..82d3a3720 100644
--- a/controllers/index.js
+++ b/controllers/index.js
@@ -13,9 +13,8 @@ var modelQuery = require('../libs/modelQuery');
 var execQueryTask = require('../libs/tasks').execQueryTask;
 var removeSession = require('../libs/modifySessions').remove;
 
-
 // The home page has scripts and groups in a sidebar
-exports.home = function (req, res) {
+exports.home = function(req, res) {
   var authedUser = req.session.user;
 
   //
@@ -72,7 +71,7 @@ exports.home = function (req, res) {
   tasks.push(execQueryTask(popularGroupListQuery, options, 'popularGroupList'));
 
   //---
-  function preRender(){
+  function preRender() {
     // scriptList
     options.scriptList = _.map(options.scriptList, modelParser.parseScript);
 
@@ -82,13 +81,13 @@ exports.home = function (req, res) {
     // Pagination
     options.paginationRendered = pagination.renderDefault(req);
   };
-  function render(){ res.render('pages/scriptListPage', options); }
-  function asyncComplete(){ preRender(); render(); }
+  function render() { res.render('pages/scriptListPage', options); }
+  function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);
 };
 
 // Preform a script search
-function getSearchResults (req, res, prefixSearch, fullSearch, opts, callback) {
+function getSearchResults(req, res, prefixSearch, fullSearch, opts, callback) {
   var user = req.session.user;
   var search = req.route.params.shift();
   var baseUrl = '/search/' + encodeURIComponent(search);
@@ -102,21 +101,21 @@ function getSearchResults (req, res, prefixSearch, fullSearch, opts, callback) {
     .split(/\s+/);
 
   // Match all the terms but in any order
-  terms.forEach(function (term) {
-    prefixStr += '(?=.*?\\b' + term  + ')';
-    fullStr += '(?=.*?' + term  + ')';
+  terms.forEach(function(term) {
+    prefixStr += '(?=.*?\\b' + term + ')';
+    fullStr += '(?=.*?' + term + ')';
   });
   prefixRegex = new RegExp(prefixStr, 'i');
   fullRegex = new RegExp(fullStr, 'i');
 
   // One of the searchable fields must match the conditions
-  prefixSearch.forEach(function (prop) {
+  prefixSearch.forEach(function(prop) {
     var condition = {};
     condition[prop] = prefixRegex;
     conditions.push(condition);
   });
 
-  fullSearch.forEach(function (prop) {
+  fullSearch.forEach(function(prop) {
     var condition = {};
     condition[prop] = fullRegex;
     conditions.push(condition);
@@ -124,52 +123,53 @@ function getSearchResults (req, res, prefixSearch, fullSearch, opts, callback) {
   opts['$or'] = conditions;
 
   modelsList.listScripts(opts, req.route.params, baseUrl,
-    function (scriptsList) {
+    function(scriptsList) {
       callback({
-        'title': 'Searching for "' + search  +'"',
+        'title': 'Searching for "' + search + '"',
         'username': user ? user.name : null,
         'search': search,
         'scriptsList': scriptsList
       });
-  });
+    }
+  );
 };
 
 // Script search results
-exports.search = function (req, res, next) {
+exports.search = function(req, res, next) {
   getSearchResults(req, res,
     ['name', 'author', 'about', 'meta.description'],
     ['meta.include', 'meta.match'], {},
-    function (options) {
+    function(options) {
       res.render('index', options);
-  });
+    });
 };
 
 // Show library scripts
-exports.toolbox = function (req, res) {
+exports.toolbox = function(req, res) {
   var user = req.session.user;
 
   modelsList.listScripts({ isLib: true }, req.route.params, '/toolbox',
-    function (scriptsList) {
+    function(scriptsList) {
       res.render('index', {
         title: 'The Toolbox',
         toolbox: true,
         username: user ? user.name : null,
         scriptsList: scriptsList
       });
-  });
+    });
 };
 
 // Search library scripts
-exports.toolSearch = function (req, res) {
+exports.toolSearch = function(req, res) {
   getSearchResults(req, res, ['name', 'author', 'about'], [], { isLib: true },
-    function (options) {
+    function(options) {
       options.toolbox = true;
       res.render('index', options);
-  });
+    });
 };
 
 // UI for user registration
-exports.register = function (req, res) {
+exports.register = function(req, res) {
   var authedUser = req.session.user;
 
   // If already logged in, goto the front page.
@@ -199,7 +199,7 @@ exports.register = function (req, res) {
   options.strategies = [];
 
   // Get OpenId strategies
-  _.each(strategies, function(strategy, strategyKey){
+  _.each(strategies, function(strategy, strategyKey) {
     if (!strategy.oauth) {
       options.strategies.push({
         'strat': strategyKey,
@@ -211,13 +211,13 @@ exports.register = function (req, res) {
   //--- Tasks
 
   //
-  tasks.push(function (callback) {
-    Strategy.find({}, function (err, availableStrategies) {
+  tasks.push(function(callback) {
+    Strategy.find({}, function(err, availableStrategies) {
       if (err) {
         callback();
       } else {
         // Get the strategies we have OAuth keys for
-        availableStrategies.forEach(function (strategy) {
+        availableStrategies.forEach(function(strategy) {
           options.strategies.push({
             'strat': strategy.name,
             'display': strategy.display
@@ -229,28 +229,28 @@ exports.register = function (req, res) {
   });
 
   //---
-  function preRender(){
+  function preRender() {
     // Sort the strategies
-    options.strategies = _.sortBy(options.strategies, function(strategy){ return strategy.display; });
+    options.strategies = _.sortBy(options.strategies, function(strategy) { return strategy.display; });
 
     // Prefer GitHub
-    var githubStrategy = _.findWhere(options.strategies, {strat: 'github'});
+    var githubStrategy = _.findWhere(options.strategies, { strat: 'github' });
     if (githubStrategy)
       githubStrategy.selected = true;
   };
-  function render(){ res.render('pages/loginPage', options); }
-  function asyncComplete(){ preRender(); render(); }
+  function render() { res.render('pages/loginPage', options); }
+  function asyncComplete() { preRender(); render(); }
   async.parallel(tasks, asyncComplete);
 };
 
-exports.logout = function (req, res) {
+exports.logout = function(req, res) {
   var authedUser = req.session.user;
 
   if (!authedUser) { return res.redirect('/'); }
 
-  User.findOne({ _id: authedUser._id }, function (err, user) {
-    removeSession(req, user, function () {
-      res.redirect('/'); 
+  User.findOne({ _id: authedUser._id }, function(err, user) {
+    removeSession(req, user, function() {
+      res.redirect('/');
     });
   });
 };
diff --git a/controllers/issue.js b/controllers/issue.js
index 82bb9a785..644d2bb47 100644
--- a/controllers/issue.js
+++ b/controllers/issue.js
@@ -12,9 +12,8 @@ var discussionLib = require('./discussion');
 var execQueryTask = require('../libs/tasks').execQueryTask;
 var countTask = require('../libs/tasks').countTask;
 
-
 // List script issues
-exports.list = function (req, res, next) {
+exports.list = function(req, res, next) {
   var authedUser = req.session.user;
 
   var type = req.route.params.type;
@@ -26,8 +25,8 @@ exports.list = function (req, res, next) {
   var installNameSlug = username + '/' + (namespace ? namespace + '/' : '') + scriptname;
 
   Script.findOne({
-    installName: installNameSlug  + (type === 'libs' ? '.js' : '.user.js')
-  }, function (err, scriptData) {
+    installName: installNameSlug + (type === 'libs' ? '.js' : '.user.js')
+  }, function(err, scriptData) {
     if (err || !scriptData) { return next(); }
 
     //
@@ -66,7 +65,7 @@ exports.list = function (req, res, next) {
     var discussionListQuery = Discussion.find();
 
     // discussionListQuery: category
-    discussionListQuery.find({category: category.slug});
+    discussionListQuery.find({ category: category.slug });
 
     // discussionListQuery: open
     modelQuery.findOrDefaultIfNull(discussionListQuery, 'open', options.openIssuesOnly, true);
@@ -83,7 +82,7 @@ exports.list = function (req, res, next) {
     //--- Tasks
 
     // Show the number of open issues
-    var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: {$ne: false} });
+    var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } });
     tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
     // Pagination
@@ -93,7 +92,7 @@ exports.list = function (req, res, next) {
     tasks.push(execQueryTask(discussionListQuery, options, 'discussionList'));
 
     //---
-    function preRender(){
+    function preRender() {
       options.discussionList = _.map(options.discussionList, modelParser.parseDiscussion);
 
       // Script
@@ -102,14 +101,14 @@ exports.list = function (req, res, next) {
       // Pagination
       options.paginationRendered = pagination.renderDefault(req);
     };
-    function render(){ res.render('pages/scriptIssueListPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function render() { res.render('pages/scriptIssueListPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
 
 // Show the discussion on an issue
-exports.view = function (req, res, next) {
+exports.view = function(req, res, next) {
   var authedUser = req.session.user;
 
   var type = req.route.params.type;
@@ -121,8 +120,8 @@ exports.view = function (req, res, next) {
   var installNameSlug = username + '/' + (namespace ? namespace + '/' : '') + scriptname;
 
   Script.findOne({
-    installName: installNameSlug  + (type === 'libs' ? '.js' : '.user.js')
-  }, function (err, scriptData) {
+    installName: installNameSlug + (type === 'libs' ? '.js' : '.user.js')
+  }, function(err, scriptData) {
     if (err || !scriptData) { return next(); }
 
     //
@@ -148,7 +147,7 @@ exports.view = function (req, res, next) {
     category.categoryPostDiscussionPageUrl = script.scriptOpenIssuePageUrl;
     options.category = category;
 
-    discussionLib.findDiscussion(category.slug, topic, function (discussionData) {
+    discussionLib.findDiscussion(category.slug, topic, function(discussionData) {
       if (err || !discussionData) { return next(); }
 
       // Discussion
@@ -161,7 +160,7 @@ exports.view = function (req, res, next) {
       var commentListQuery = Comment.find();
 
       // commentListQuery: discussion
-      commentListQuery.find({_discussionId: discussion._id});
+      commentListQuery.find({ _discussionId: discussion._id });
 
       // commentListQuery: Defaults
       modelQuery.applyCommentListQueryDefaults(commentListQuery, options, req);
@@ -172,7 +171,7 @@ exports.view = function (req, res, next) {
       //--- Tasks
 
       // Show the number of open issues
-      var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: {$ne: false} });
+      var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } });
       tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
       // Pagination
@@ -181,7 +180,7 @@ exports.view = function (req, res, next) {
       // commentListQuery
       tasks.push(execQueryTask(commentListQuery, options, 'commentList'));
 
-      function preRender(){
+      function preRender() {
         // Metadata
         options.title = discussion.topic + ' | OpenUserJS.org';
         options.pageMetaDescription = discussion.topic;
@@ -189,7 +188,7 @@ exports.view = function (req, res, next) {
 
         // commentList
         options.commentList = _.map(options.commentList, modelParser.parseComment);
-        _.map(options.commentList, function(comment){
+        _.map(options.commentList, function(comment) {
           comment.author = modelParser.parseUser(comment._authorId);
         });
         _.map(options.commentList, modelParser.renderComment);
@@ -200,15 +199,15 @@ exports.view = function (req, res, next) {
         // Pagination
         options.paginationRendered = pagination.renderDefault(req);
       };
-      function render(){ res.render('pages/scriptIssuePage', options); }
-      function asyncComplete(){ preRender(); render(); }
+      function render() { res.render('pages/scriptIssuePage', options); }
+      function asyncComplete() { preRender(); render(); }
       async.parallel(tasks, asyncComplete);
     });
   });
 };
 
 // Open a new issue
-exports.open = function (req, res, next) {
+exports.open = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -220,8 +219,8 @@ exports.open = function (req, res, next) {
   var installNameSlug = scriptStorage.getInstallName(req);
 
   Script.findOne({
-    installName: installNameSlug  + (type === 'libs' ? '.js' : '.user.js')
-  }, function (err, scriptData) {
+    installName: installNameSlug + (type === 'libs' ? '.js' : '.user.js')
+  }, function(err, scriptData) {
     if (err || !scriptData) { return next(); }
 
     //
@@ -250,7 +249,7 @@ exports.open = function (req, res, next) {
     if (topic && content) {
       // Issue Submission
       discussionLib.postTopic(authedUser, category.slug, topic, content, true,
-        function (discussion) {
+        function(discussion) {
           if (!discussion)
             return res.redirect('/' + encodeURI(category) + '/open');
 
@@ -260,26 +259,25 @@ exports.open = function (req, res, next) {
     } else {
       // New Issue Page
 
-
       //--- Tasks
       // ...
 
       //---
-      function preRender(){
+      function preRender() {
         // Metadata
         options.title = 'New Issue for ' + script.name + ' | OpenUserJS.org';
         options.pageMetaDescription = '';
         options.pageMetaKeywords = null; // seperator = ', '
       };
-      function render(){ res.render('pages/scriptNewIssuePage', options); }
-      function asyncComplete(){ preRender(); render(); }
+      function render() { res.render('pages/scriptNewIssuePage', options); }
+      function asyncComplete() { preRender(); render(); }
       async.parallel(tasks, asyncComplete);
     }
   });
 };
 
 // post route to add a new comment to a discussion on an issue
-exports.comment = function (req, res, next) {
+exports.comment = function(req, res, next) {
   var type = req.route.params.type;
   var topic = req.route.params.topic;
   var installName = scriptStorage.getInstallName(req);
@@ -288,26 +286,28 @@ exports.comment = function (req, res, next) {
 
   if (!user) { return res.redirect('/login'); }
 
-  Script.findOne({ installName: installName
-    + (type === 'libs' ? '.js' : '.user.js') }, function (err, script) {
-      var content = req.body['comment-content'];
+  Script.findOne({
+    installName: installName
+      + (type === 'libs' ? '.js' : '.user.js')
+  }, function(err, script) {
+    var content = req.body['comment-content'];
 
-      if (err || !script) { return next(); }
+    if (err || !script) { return next(); }
 
-      discussionLib.findDiscussion(category, topic, function (issue) {
-        if (!issue) { return next(); }
+    discussionLib.findDiscussion(category, topic, function(issue) {
+      if (!issue) { return next(); }
 
-        discussionLib.postComment(user, issue, content, false,
-          function (err, discussion) {
-            res.redirect(encodeURI(discussion.path
-              + (discussion.duplicateId ? '_' + discussion.duplicateId : '')));
+      discussionLib.postComment(user, issue, content, false,
+        function(err, discussion) {
+          res.redirect(encodeURI(discussion.path
+            + (discussion.duplicateId ? '_' + discussion.duplicateId : '')));
         });
-      });
+    });
   });
 };
 
 // Open or close and issue you are allowed
-exports.changeStatus = function (req, res, next) {
+exports.changeStatus = function(req, res, next) {
   var type = req.route.params.type;
   var topic = req.route.params.topic;
   var installName = scriptStorage.getInstallName(req);
@@ -318,34 +318,36 @@ exports.changeStatus = function (req, res, next) {
 
   if (!user) { return res.redirect('/login'); }
 
-  Script.findOne({ installName: installName
-    + (type === 'libs' ? '.js' : '.user.js') }, function (err, script) {
-
-      if (err || !script) { return next(); }
-
-      discussionLib.findDiscussion(category, topic, function (issue) {
-        if (!issue) { return next(); }
-
-        // Both the script author and the issue creator can close the issue
-        // Only the script author can reopen a closed issue
-        if (action === 'close' && issue.open
-          && (user.name === issue.author || user.name === script.author)) {
-          issue.open = false;
-          changed = true;
-        } else if (action === 'reopen' && !issue.open
-          && user.name === script.author) {
-          issue.open = true;
-          changed = true;
-        }
-
-        if (changed) {
-          issue.save(function (err, discussion) {
-            res.redirect(encodeURI(discussion.path
-              + (discussion.duplicateId ? '_' + discussion.duplicateId : '')));
-          });
-        } else {
-          next();
-        }
-      });
+  Script.findOne({
+    installName: installName
+      + (type === 'libs' ? '.js' : '.user.js')
+  }, function(err, script) {
+
+    if (err || !script) { return next(); }
+
+    discussionLib.findDiscussion(category, topic, function(issue) {
+      if (!issue) { return next(); }
+
+      // Both the script author and the issue creator can close the issue
+      // Only the script author can reopen a closed issue
+      if (action === 'close' && issue.open
+      && (user.name === issue.author || user.name === script.author)) {
+        issue.open = false;
+        changed = true;
+      } else if (action === 'reopen' && !issue.open
+        && user.name === script.author) {
+        issue.open = true;
+        changed = true;
+      }
+
+      if (changed) {
+        issue.save(function(err, discussion) {
+          res.redirect(encodeURI(discussion.path
+            + (discussion.duplicateId ? '_' + discussion.duplicateId : '')));
+        });
+      } else {
+        next();
+      }
+    });
   });
 };
diff --git a/controllers/moderation.js b/controllers/moderation.js
index cfda388f0..f1f2cc9d8 100644
--- a/controllers/moderation.js
+++ b/controllers/moderation.js
@@ -11,52 +11,54 @@ var statusCodePage = require('../libs/templateHelpers').statusCodePage;
 
 // When content reaches a its threshold of flags it gets marked as flagged
 // and it can now be removed by moderators
-exports.flagged = function (req, res, next) {
+exports.flagged = function(req, res, next) {
   var user = req.session.user;
   var type = req.route.params.shift() || 'users';
   var baseUrl = '/flagged' + (type ? '/' + type : '');
-  var options = { title: 'Flagged Content', moderation: true,
-    username: user ? user.name : '' };
+  var options = {
+    title: 'Flagged Content', moderation: true,
+    username: user ? user.name : ''
+  };
 
   options[type + 'Type'] = true;
 
   if (!user || user.role > 3) { return next(); }
 
   switch (type) {
-  case 'users':
-    if (!req.route.params[1]) {
-      req.route.params[1] = ['flags'];
-    }
+    case 'users':
+      if (!req.route.params[1]) {
+        req.route.params[1] = ['flags'];
+      }
 
-    modelsList.listUsers({ flagged: true }, req.route.params, baseUrl,
-      function (usersList) {
-        options.usersList = usersList;
-        res.render('flagged', options);
-    });
-    break;
-  case 'scripts':
-    if (!req.route.params[1]) {
-      req.route.params[1] = ['flags', 'updated'];
-    }
+      modelsList.listUsers({ flagged: true }, req.route.params, baseUrl,
+        function(usersList) {
+          options.usersList = usersList;
+          res.render('flagged', options);
+        });
+      break;
+    case 'scripts':
+      if (!req.route.params[1]) {
+        req.route.params[1] = ['flags', 'updated'];
+      }
 
-    modelsList.listScripts({ flagged: true, isLib: null },
-      req.route.params, baseUrl,
-      function (scriptsList) {
-        options.scriptsList = scriptsList;
-        res.render('flagged', options);
-    });
-    break;
-  default:
-    next();
+      modelsList.listScripts({ flagged: true, isLib: null },
+        req.route.params, baseUrl,
+        function(scriptsList) {
+          options.scriptsList = scriptsList;
+          res.render('flagged', options);
+        });
+      break;
+    default:
+      next();
   }
 };
 
 // When content is remove via the community moderation system it isn't
 // actually deleted. Instead it is sent to the graveyard where hopefully
 // any mistakes can be undone.
-exports.graveyard = function (req, res, next) {
+exports.graveyard = function(req, res, next) {
   var contentTypes = {
-    'users' :
+    'users':
     {
       'name': 'User',
       'selected': false,
@@ -79,7 +81,7 @@ exports.graveyard = function (req, res, next) {
   // Hopefully one day it can actually be viewed read-only by
   // those who have the authority
   modelsList.listRemoved({ model: contentType.name }, req.route.params, baseUrl,
-    function (removedList) {
+    function(removedList) {
       var type = null;
       var name = null;
       contentType.selected = true;
@@ -99,7 +101,7 @@ exports.graveyard = function (req, res, next) {
     });
 };
 
-exports.removedItemPage = function (req, res, next) {
+exports.removedItemPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   var removedItemId = req.route.params.id;
@@ -126,10 +128,10 @@ exports.removedItemPage = function (req, res, next) {
     if (err || !removedItemData) { return next(); }
 
     res.json(removedItemData);
-  })
+  });
 };
 
-exports.removedItemListPage = function (req, res, next) {
+exports.removedItemListPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -186,7 +188,7 @@ exports.removedItemListPage = function (req, res, next) {
   });
 };
 
-exports.modPage = function (req, res, next) {
+exports.modPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
diff --git a/controllers/remove.js b/controllers/remove.js
index 2318c8e05..75bfa9e88 100644
--- a/controllers/remove.js
+++ b/controllers/remove.js
@@ -4,36 +4,36 @@ var User = require('../models/user').User;
 var destroySessions = require('../libs/modifySessions').destroy;
 
 // Simple controller to remove content and save it in the graveyard
-exports.rm = function (req, res, next) {
+exports.rm = function(req, res, next) {
   var type = req.route.params[0];
   var path = req.route.params[1];
   var thisUser = req.session.user;
 
   switch (type) {
-  case 'scripts':
-  case 'libs':
-    path += type === 'libs' ? '.js' : '.user.js';
-    Script.findOne({ installName: path }, function (err, script) {
-      removeLib.remove(Script, script, thisUser, '', function (removed) {
-        if (!removed) { return next(); }
-        res.redirect('/');
-      });
-    });
-    break;
-  case 'users':
-    User.findOne({ name : { $regex : new RegExp('^' + path + '$', "i") } },
-      function (err, user) {
-        removeLib.remove(User, user, thisUser, '', function (removed) {
+    case 'scripts':
+    case 'libs':
+      path += type === 'libs' ? '.js' : '.user.js';
+      Script.findOne({ installName: path }, function(err, script) {
+        removeLib.remove(Script, script, thisUser, '', function(removed) {
           if (!removed) { return next(); }
+          res.redirect('/');
+        });
+      });
+      break;
+    case 'users':
+      User.findOne({ name: { $regex: new RegExp('^' + path + '$', "i") } },
+        function(err, user) {
+          removeLib.remove(User, user, thisUser, '', function(removed) {
+            if (!removed) { return next(); }
 
-          // Destory all the sessions belonging to the removed user
-          destroySessions(req, user, function () {
-            res.redirect('/');
+            // Destory all the sessions belonging to the removed user
+            destroySessions(req, user, function() {
+              res.redirect('/');
+            });
           });
         });
-    });
-    break;
-  default:
-    next();
+      break;
+    default:
+      next();
   }
 };
diff --git a/controllers/script.js b/controllers/script.js
index 5d66b92b2..e8e3a2909 100644
--- a/controllers/script.js
+++ b/controllers/script.js
@@ -18,31 +18,31 @@ var modelParser = require('../libs/modelParser');
 var countTask = require('../libs/tasks').countTask;
 
 // Let script controllers know this is a lib route
-exports.lib = function (controller) {
-  return (function (req, res, next) {
+exports.lib = function(controller) {
+  return (function(req, res, next) {
     req.route.params.isLib = true;
     controller(req, res, next);
   });
 };
 
 // Display which scripts use a library hosted on the site
-exports.useLib = function (req, res, next) {
+exports.useLib = function(req, res, next) {
   var installName = req.route.params.shift().toLowerCase() + '/'
     + req.route.params.shift();
   var user = req.session.user;
   var options = { username: user ? user.name : '' };
 
-  Script.findOne({ installName: installName + '.js' }, function (err, lib) {
+  Script.findOne({ installName: installName + '.js' }, function(err, lib) {
     if (err || !lib) { return next(); }
 
     options.title = 'Scripts that use <a href="/libs/' + installName + '">'
       + lib.name + '</a>';
     modelsList.listScripts({ uses: lib.installName },
       req.route.params, '/use/lib/' + installName,
-      function (scriptsList) {
+      function(scriptsList) {
         options.scriptsList = scriptsList;
         res.render('group', options);
-    });
+      });
   });
 };
 
@@ -53,14 +53,12 @@ var getScriptPageTasks = function(options) {
   var script = options.script;
   var authedUser = options.authedUser;
 
-
   //--- Tasks
 
   // Show the number of open issues
-  var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: {$ne: false} });
+  var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } });
   tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
-
   // Show collaborators of the script
   if (script.meta.author && script.meta.collaborator) {
     options.hasCollab = true;
@@ -68,7 +66,7 @@ var getScriptPageTasks = function(options) {
       options.script.meta.collaborators = [{ name: script.meta.collaborator }];
     } else {
       options.script.meta.collaborators = [];
-      script.meta.collaborator.forEach(function (collaborator) {
+      script.meta.collaborator.forEach(function(collaborator) {
         options.script.meta.collaborators.push({ name: collaborator });
       });
     }
@@ -80,22 +78,22 @@ var getScriptPageTasks = function(options) {
       options.script.meta.licenses = [{ name: script.meta.license }];
     } else {
       options.script.meta.licenses = [];
-      script.meta.license.forEach(function (license) {
+      script.meta.license.forEach(function(license) {
         options.script.meta.licenses.push({ name: license });
       });
     }
   } else if (!script.isLib) {
-      options.script.meta.licenses = [{ name: 'MIT License (Expat)' }];
+    options.script.meta.licenses = [{ name: 'MIT License (Expat)' }];
   }
 
   // Show the groups the script belongs to
-  tasks.push(function (callback) {
+  tasks.push(function(callback) {
     script.hasGroups = false;
     script.groups = [];
 
     Group.find({
       _scriptIds: script._id
-    }, function (err, scriptGroupList) {
+    }, function(err, scriptGroupList) {
       if (err) return callback(err);
 
       scriptGroupList = _.map(scriptGroupList, modelParser.parseGroup);
@@ -111,10 +109,10 @@ var getScriptPageTasks = function(options) {
   if (!script.isLib && script.uses && script.uses.length > 0) {
     script.usesLibs = true;
     script.libs = [];
-    tasks.push(function (callback) {
+    tasks.push(function(callback) {
       Script.find({
         installName: { $in: script.uses }
-      }, function (err, scriptLibraryList) {
+      }, function(err, scriptLibraryList) {
         if (err) return callback(err);
 
         script.libs = scriptLibraryList;
@@ -125,10 +123,10 @@ var getScriptPageTasks = function(options) {
   } else if (script.isLib) {
     script.isUsed = false;
     script.usedBy = [];
-    tasks.push(function (callback) {
+    tasks.push(function(callback) {
       Script.find({
         uses: script.installName
-      }, function (err, libraryScriptList) {
+      }, function(err, libraryScriptList) {
         if (err) return callback(err);
 
         script.isUsed = libraryScriptList.length > 0;
@@ -140,7 +138,7 @@ var getScriptPageTasks = function(options) {
   }
 
   // Setup the voting UI
-  tasks.push(function (callback) {
+  tasks.push(function(callback) {
     var voteUrl = '/vote' + script.scriptPageUrl;
     options.voteUpUrl = voteUrl + '/up';
     options.voteDownUrl = voteUrl + '/down';
@@ -159,7 +157,7 @@ var getScriptPageTasks = function(options) {
     Vote.findOne({
       _scriptId: script._id,
       _userId: authedUser._id
-    }, function (err, voteModel) {
+    }, function(err, voteModel) {
       options.voteable = !script.isOwner;
 
       if (voteModel) {
@@ -176,7 +174,7 @@ var getScriptPageTasks = function(options) {
   });
 
   // Setup the flagging UI
-  tasks.push(function (callback) {
+  tasks.push(function(callback) {
     var flagUrl = '/flag' + (script.isLib ? '/libs/' : '/scripts/') + script.installNameSlug;
 
     // Can't flag when not logged in or when user owns the script.
@@ -186,7 +184,7 @@ var getScriptPageTasks = function(options) {
     }
 
     flagLib.flaggable(Script, script, authedUser,
-      function (canFlag, author, flag) {
+      function(canFlag, author, flag) {
         if (flag) {
           flagUrl += '/unflag';
           options.flagged = true;
@@ -197,11 +195,11 @@ var getScriptPageTasks = function(options) {
         options.flagUrl = flagUrl;
 
         callback();
-    });
+      });
   });
 
   // Set up the removal UI
-  tasks.push(function (callback) {
+  tasks.push(function(callback) {
     // Can't remove when not logged in or when user owns the script.
     if (!authedUser || options.isOwner) {
       callback();
@@ -209,7 +207,7 @@ var getScriptPageTasks = function(options) {
     }
 
     removeLib.removeable(Script, script, authedUser,
-      function (canRemove, author) {
+      function(canRemove, author) {
         options.canRemove = canRemove;
         options.flags = script.flags || 0;
         options.removeUrl = '/remove' + (script.isLib ? '/libs/' : '/scripts/') + script.installNameSlug;
@@ -217,11 +215,11 @@ var getScriptPageTasks = function(options) {
         if (!canRemove) { return callback(); }
 
         flagLib.getThreshold(Script, script, author,
-          function (threshold) {
+          function(threshold) {
             options.threshold = threshold;
             callback();
-        });
-    });
+          });
+      });
   });
 
   return tasks;
@@ -251,7 +249,7 @@ var setupScriptSidePanel = function(options) {
 
 // View a detailed description of a script
 // This is the most intensive page to render on the site
-exports.view = function (req, res, next) {
+exports.view = function(req, res, next) {
   var authedUser = req.session.user;
 
   var installNameSlug = scriptStorage.getInstallName(req);
@@ -261,7 +259,7 @@ exports.view = function (req, res, next) {
 
   Script.findOne({
     installName: installNameSlug + (isLib ? '.js' : '.user.js')
-  }, function (err, scriptData) {
+  }, function(err, scriptData) {
     if (err || !scriptData) { return next(); }
 
     var options = {};
@@ -294,22 +292,21 @@ exports.view = function (req, res, next) {
     //--- Tasks
     tasks = tasks.concat(getScriptPageTasks(options));
 
-
     //---
-    function preRender(){
+    function preRender() {
       var pageMetaKeywords = ['userscript', 'greasemonkey'];
       if (script.groups)
         pageMetaKeywords.concat(_.pluck(script.groups, 'name'));
       options.pageMetaKeywords = pageMetaKeywords.join(', ');
     };
-    function render(){ res.render('pages/scriptPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function render() { res.render('pages/scriptPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
 
 // route to edit a script
-exports.edit = function (req, res, next) {
+exports.edit = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) { return res.redirect('/login'); }
@@ -324,7 +321,7 @@ exports.edit = function (req, res, next) {
 
   Script.findOne({
     installName: installNameSlug + (isLib ? '.js' : '.user.js')
-  }, function (err, scriptData) {
+  }, function(err, scriptData) {
     if (err || !scriptData) { return next(); }
 
     //
@@ -352,7 +349,7 @@ exports.edit = function (req, res, next) {
 
     if (req.body.remove) {
       // POST
-      scriptStorage.deleteScript(scriptData.installName, function () {
+      scriptStorage.deleteScript(scriptData.installName, function() {
         res.redirect(authedUser.userScriptListPageUrl);
       });
     } else if (typeof req.body.about !== 'undefined') {
@@ -360,7 +357,7 @@ exports.edit = function (req, res, next) {
       scriptData.about = req.body.about;
       var scriptGroups = (req.body.groups || "");
       scriptGroups = scriptGroups.split(/,/);
-      addScriptToGroups(scriptData, scriptGroups, function () {
+      addScriptToGroups(scriptData, scriptGroups, function() {
         res.redirect(script.scriptPageUrl);
       });
     } else {
@@ -370,22 +367,22 @@ exports.edit = function (req, res, next) {
 
       tasks = tasks.concat(getScriptPageTasks(options));
 
-      tasks.push(function (callback) {
+      tasks.push(function(callback) {
         callback();
       });
 
       // Groups
       options.canCreateGroup = (!script._groupId).toString();
 
-      function preRender(){
-        var groupNameList = (options.script.groups || []).map(function (group) {
+      function preRender() {
+        var groupNameList = (options.script.groups || []).map(function(group) {
           return group.name;
         });
         options.groupNameListJSON = JSON.stringify(groupNameList);
 
       };
-      function render(){ res.render('pages/scriptEditMetadataPage', options); }
-      function asyncComplete(){ preRender(); render(); }
+      function render() { res.render('pages/scriptEditMetadataPage', options); }
+      function asyncComplete() { preRender(); render(); }
       async.parallel(tasks, asyncComplete);
 
       // Group.find({ _scriptIds: script._id }, 'name', function (err, groups) {
@@ -411,7 +408,7 @@ exports.edit = function (req, res, next) {
 };
 
 // Script voting
-exports.vote = function (req, res, next) {
+exports.vote = function(req, res, next) {
   var isLib = req.route.params.isLib;
   var installName = scriptStorage.getInstallName(req)
     + (isLib ? '.js' : '.user.js');
@@ -438,25 +435,25 @@ exports.vote = function (req, res, next) {
   }
 
   Script.findOne({ installName: installName },
-    function (err, script) {
+    function(err, script) {
       if (err || !script) { return res.redirect(url); }
 
       Vote.findOne({ _scriptId: script._id, _userId: user._id },
-        function (err, voteModel) {
+        function(err, voteModel) {
           var oldVote = null;
           var votes = script.votes || 0;
           var flags = 0;
 
-          function saveScript () {
+          function saveScript() {
             if (!flags) {
-              return script.save(function (err, script) { res.redirect(url); });
+              return script.save(function(err, script) { res.redirect(url); });
             }
 
             flagLib.getAuthor(script, function(author) {
               flagLib.saveContent(Script, script, author, flags,
-                function (flagged) {
+                function(flagged) {
                   res.redirect(url);
-              });
+                });
             });
           }
 
@@ -476,7 +473,7 @@ exports.vote = function (req, res, next) {
             if (vote) { flags = -1; }
           } else if (unvote) {
             oldVote = voteModel.vote;
-            return voteModel.remove(function () {
+            return voteModel.remove(function() {
               script.rating += oldVote ? -1 : 1;
               script.votes = votes <= 0 ? 0 : votes - 1;
               if (oldVote) { flags = 1; }
@@ -489,23 +486,26 @@ exports.vote = function (req, res, next) {
           }
 
           voteModel.save(saveScript);
-      });
-  });
+        }
+      );
+    }
+  );
 };
 
 // Script flagging
-exports.flag = function (req, res, next) {
+exports.flag = function(req, res, next) {
   var isLib = req.route.params.isLib;
   var installName = scriptStorage.getInstallName(req);
   var unflag = req.route.params.unflag;
 
   Script.findOne({ installName: installName + (isLib ? '.js' : '.user.js') },
-    function (err, script) {
+    function(err, script) {
       var fn = flagLib[unflag && unflag === 'unflag' ? 'unflag' : 'flag'];
       if (err || !script) { return next(); }
 
-      fn(Script, script, req.session.user, function (flagged) {
+      fn(Script, script, req.session.user, function(flagged) {
         res.redirect((isLib ? '/libs/' : '/scripts/') + encodeURI(installName));
       });
-  });
+    }
+  );
 };
diff --git a/controllers/scriptStorage.js b/controllers/scriptStorage.js
index c9f2a3273..12d1865ec 100644
--- a/controllers/scriptStorage.js
+++ b/controllers/scriptStorage.js
@@ -15,13 +15,15 @@ if (process.env.NODE_ENV === 'production') {
   // You need to install (and ruby too): https://github.com/jubos/fake-s3
   // Then run the fakes3.sh script or: fakes3 -r fakeS3 -p 10001
   var DEV_AWS_URL = process.env.DEV_AWS_URL || 'localhost:10001';
-  AWS.config.update({ accessKeyId: 'fakeId', secretAccessKey: 'fakeKey',
+  AWS.config.update({
+    accessKeyId: 'fakeId', secretAccessKey: 'fakeKey',
     httpOptions: {
-    proxy: DEV_AWS_URL, agent: require('http').globalAgent
-  }});
+      proxy: DEV_AWS_URL, agent: require('http').globalAgent
+    }
+  });
 }
 
-function getInstallName (req) {
+function getInstallName(req) {
   var username = req.route.params.username.toLowerCase();
   var namespace = req.route.params.namespace;
   return username + '/' + (namespace ? namespace + '/' : '')
@@ -29,11 +31,11 @@ function getInstallName (req) {
 }
 exports.getInstallName = getInstallName;
 
-exports.getSource = function (req, callback) {
+exports.getSource = function(req, callback) {
   var s3 = new AWS.S3();
   var installName = getInstallName(req);
 
-  Script.findOne({ installName: installName }, function (err, script) {
+  Script.findOne({ installName: installName }, function(err, script) {
     if (!script) { return callback(null); }
 
     // Get the script
@@ -42,7 +44,7 @@ exports.getSource = function (req, callback) {
   });
 };
 
-exports.sendScript = function (req, res, next) {
+exports.sendScript = function(req, res, next) {
   var accept = req.headers.accept;
   var installName = null;
 
@@ -50,7 +52,7 @@ exports.sendScript = function (req, res, next) {
     return exports.sendMeta(req, res, next);
   }
 
-  exports.getSource(req, function (script, stream) {
+  exports.getSource(req, function(script, stream) {
     if (!script) { return next(); }
 
     // Send the script
@@ -62,15 +64,15 @@ exports.sendScript = function (req, res, next) {
 
     // Update the install count
     ++script.installs;
-    script.save(function (err, script) {});
+    script.save(function(err, script) { });
   });
 };
 
 // Send user script metadata block
-exports.sendMeta = function (req, res, next) {
+exports.sendMeta = function(req, res, next) {
   var installName = getInstallName(req).replace(/\.meta\.js$/, '.user.js');
 
-  Script.findOne({ installName: installName }, function (err, script) {
+  Script.findOne({ installName: installName }, function(err, script) {
     var meta = null;
 
     if (!script) { return next(); }
@@ -79,9 +81,9 @@ exports.sendMeta = function (req, res, next) {
     meta = script.meta;
 
     res.write('// ==UserScript==\n');
-    Object.keys(meta).reverse().forEach(function (key) {
+    Object.keys(meta).reverse().forEach(function(key) {
       if (meta[key] instanceof Array) {
-        meta[key].forEach(function (value) {
+        meta[key].forEach(function(value) {
           res.write('// @' + key + '    ' + value + '\n');
         });
       } else {
@@ -111,7 +113,7 @@ function parseMeta(aString) {
     'author': true
   };
 
-  lines = aString.split(/[\r\n]+/).filter(function (e, i, a) {
+  lines = aString.split(/[\r\n]+/).filter(function(e, i, a) {
     return (e.match(re));
   });
 
@@ -138,7 +140,7 @@ function parseMeta(aString) {
 }
 exports.parseMeta = parseMeta;
 
-exports.getMeta = function (chunks, callback) {
+exports.getMeta = function(chunks, callback) {
   // We need to convert the array of buffers to a string to
   // parse the header. But strings are memory inefficient compared
   // to buffers so we only convert the least number of chunks to
@@ -158,7 +160,7 @@ exports.getMeta = function (chunks, callback) {
   callback(null);
 };
 
-exports.storeScript = function (user, meta, buf, callback, update) {
+exports.storeScript = function(user, meta, buf, callback, update) {
   var s3 = new AWS.S3();
   var namespace = null;
   var scriptName = null;
@@ -207,9 +209,9 @@ exports.storeScript = function (user, meta, buf, callback, update) {
         requires = meta.require;
       }
 
-      requires.forEach(function (require) {
-          var match = libraryRegex.exec(require);
-          if (match && match[1]) { libraries.push(match[1]); }
+      requires.forEach(function(require) {
+        var match = libraryRegex.exec(require);
+        if (match && match[1]) { libraries.push(match[1]); }
       });
     }
   } else {
@@ -221,7 +223,7 @@ exports.storeScript = function (user, meta, buf, callback, update) {
 
   // Prevent a removed script from being reuploaded
   findDeadorAlive(Script, { installName: installName }, true,
-    function (alive, script, removed) {
+    function(alive, script, removed) {
 
       if (removed || (!script && (update || collaborators))) {
         return callback(null);
@@ -255,9 +257,9 @@ exports.storeScript = function (user, meta, buf, callback, update) {
         script.updated = new Date();
       }
 
-      script.save(function (err, script) {
-        s3.putObject({ Bucket : bucketName, Key : installName, Body : buf },
-          function (err, data) {
+      script.save(function(err, script) {
+        s3.putObject({ Bucket: bucketName, Key: installName, Body: buf },
+          function(err, data) {
             if (user.role === userRoles.length - 1) {
               var userDoc = user;
               if (!userDoc.save) {
@@ -265,25 +267,25 @@ exports.storeScript = function (user, meta, buf, callback, update) {
                 userDoc = new User(userDoc);
               }
               --userDoc.role;
-              userDoc.save(function (err, user) { callback(script); });
+              userDoc.save(function(err, user) { callback(script); });
             } else {
               callback(script);
             }
-        });
+          });
       });
-  });
+    });
 };
 
-exports.deleteScript = function (installName, callback) {
-  Script.findOneAndRemove({ installName: installName }, function (err, user) {
+exports.deleteScript = function(installName, callback) {
+  Script.findOneAndRemove({ installName: installName }, function(err, user) {
     var s3 = new AWS.S3();
-    s3.deleteObject({ Bucket : bucketName, Key : installName}, callback);
+    s3.deleteObject({ Bucket: bucketName, Key: installName }, callback);
   });
 };
 
 // GitHub calls this on a push if a webhook is setup
 // This controller makes sure we have the latest version of a script
-exports.webhook = function (req, res) {
+exports.webhook = function(req, res) {
   var RepoManager = require('../libs/repoManager');
   var payload = null;
   var username = null;
@@ -291,7 +293,7 @@ exports.webhook = function (req, res) {
   var repos = {};
   var repo = null;
 
-  res.end(); // close connection
+  res.end(); // Close connection
 
   // Test for know GH webhook ips: https://api.github.com/meta
   if (!req.body.payload ||
@@ -312,12 +314,12 @@ exports.webhook = function (req, res) {
   repo = repos[reponame] = {};
 
   // Find the user that corresponds the repo owner
-  User.findOne({ ghUsername: username }, function (err, user) {
+  User.findOne({ ghUsername: username }, function(err, user) {
     if (!user) { return; }
 
     // Gather the modified user scripts
-    payload.commits.forEach(function (commit) {
-      commit.modified.forEach(function (filename) {
+    payload.commits.forEach(function(commit) {
+      commit.modified.forEach(function(filename) {
         if (filename.substr(-8) === '.user.js') {
           repo[filename] = '/' + encodeURI(filename);
         }
@@ -326,6 +328,6 @@ exports.webhook = function (req, res) {
 
     // Update modified scripts
     var repoManager = RepoManager.getManager(null, user, repos);
-    repoManager.loadScripts(function (){}, true);
+    repoManager.loadScripts(function() { }, true);
   });
 };
diff --git a/controllers/user.js b/controllers/user.js
index 748d6a332..0fcf421d3 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -41,7 +41,7 @@ var setupUserModerationUITask = function(options) {
       callback();
       return;
     }
-    flagLib.flaggable(User, user, authedUser, function (canFlag, author, flag) {
+    flagLib.flaggable(User, user, authedUser, function(canFlag, author, flag) {
       if (flag) {
         flagUrl += '/unflag';
         options.flagged = true;
@@ -51,13 +51,13 @@ var setupUserModerationUITask = function(options) {
       }
       options.flagUrl = flagUrl;
 
-      removeLib.removeable(User, user, authedUser, function (canRemove, author) {
+      removeLib.removeable(User, user, authedUser, function(canRemove, author) {
         options.canRemove = canRemove;
         options.flags = user.flags || 0;
 
         if (!canRemove) { return callback(); }
 
-        flagLib.getThreshold(User, user, author, function (threshold) {
+        flagLib.getThreshold(User, user, author, function(threshold) {
           options.threshold = threshold;
           callback();
         });
@@ -87,11 +87,11 @@ var getUserPageTasks = function(options) {
   //--- Tasks
 
   // userScriptListCountQuery
-  var userScriptListCountQuery = Script.find({ _authorId: user._id, flagged: {$ne: true}});
+  var userScriptListCountQuery = Script.find({ _authorId: user._id, flagged: { $ne: true } });
   tasks.push(countTask(userScriptListCountQuery, options, 'scriptListCount'));
 
   // userCommentListCountQuery
-  var userCommentListCountQuery = Comment.find({ _authorId: user._id, flagged: {$ne: true}});
+  var userCommentListCountQuery = Comment.find({ _authorId: user._id, flagged: { $ne: true } });
   tasks.push(countTask(userCommentListCountQuery, options, 'commentListCount'));
 
   return tasks;
@@ -119,7 +119,7 @@ var setupUserSidePanel = function(options) {
 
     // user.role
     // Allow authedUser to raise target user role to the level below him.
-    var roles = _.map(userRoles, function(roleName, index){
+    var roles = _.map(userRoles, function(roleName, index) {
       return {
         id: index,
         name: roleName,
@@ -139,7 +139,7 @@ var setupUserSidePanel = function(options) {
   }
 };
 
-exports.userListPage = function (req, res, next) {
+exports.userListPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -174,27 +174,27 @@ exports.userListPage = function (req, res, next) {
   tasks.push(execQueryTask(userListQuery, options, 'userList'));
 
   //---
-  function preRender(){
+  function preRender() {
     // userList
     options.userList = _.map(options.userList, modelParser.parseUser);
 
     // Pagination
     options.paginationRendered = pagination.renderDefault(req);
   };
-  function render(){ res.render('pages/userListPage', options); }
-  function asyncComplete(err){ if (err) { return next(); } else { preRender(); render(); } };
+  function render() { res.render('pages/userListPage', options); }
+  function asyncComplete(err) { if (err) { return next(); } else { preRender(); render(); } };
   async.parallel(tasks, asyncComplete);
 };
 
 // View information and scripts of a user
-exports.view = function (req, res, next) {
+exports.view = function(req, res, next) {
   var authedUser = req.session.user;
 
   var username = req.route.params.username;
 
   User.findOne({
     name: username
-  }, function (err, userData) {
+  }, function(err, userData) {
     if (err || !userData) { return next(); }
 
     //
@@ -224,7 +224,7 @@ exports.view = function (req, res, next) {
     var scriptListQuery = Script.find();
 
     // scriptListQuery: author=user
-    scriptListQuery.find({_authorId: user._id});
+    scriptListQuery.find({ _authorId: user._id });
 
     // scriptListQuery: Defaults
     modelQuery.applyScriptListQueryDefaults(scriptListQuery, options, req);
@@ -241,15 +241,13 @@ exports.view = function (req, res, next) {
     tasks = tasks.concat(getUserSidePanelTasks(options));
 
     //---
-    function preRender(){};
-    function render(){ res.render('pages/userPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function preRender() { };
+    function render() { res.render('pages/userPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
 
-
-
 exports.userCommentListPage = function(req, res, next) {
   var authedUser = req.session.user;
 
@@ -257,7 +255,7 @@ exports.userCommentListPage = function(req, res, next) {
 
   User.findOne({
     name: username
-  }, function (err, userData) {
+  }, function(err, userData) {
     if (err || !userData) { return next(); }
 
     //
@@ -283,7 +281,7 @@ exports.userCommentListPage = function(req, res, next) {
     var commentListQuery = Comment.find();
 
     // commentListQuery: author=user
-    commentListQuery.find({_authorId: user._id});
+    commentListQuery.find({ _authorId: user._id });
 
     // commentListQuery: Defaults
     modelQuery.applyCommentListQueryDefaults(commentListQuery, options, req);
@@ -314,24 +312,24 @@ exports.userCommentListPage = function(req, res, next) {
     tasks = tasks.concat(getUserPageTasks(options));
 
     //--
-    function preRender(){
+    function preRender() {
       // commentList
       options.commentList = _.map(options.commentList, modelParser.parseComment);
-      _.map(options.commentList, function(comment){
+      _.map(options.commentList, function(comment) {
         comment.author = modelParser.parseUser(comment._authorId);
       });
       _.map(options.commentList, modelParser.renderComment);
 
       // comment.discussion
-      _.map(options.commentList, function(comment){
+      _.map(options.commentList, function(comment) {
         comment.discussion = modelParser.parseDiscussion(comment._discussionId);
       });
 
       // Pagination
       options.paginationRendered = pagination.renderDefault(req);
     };
-    function render(){ res.render('pages/userCommentListPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function render() { res.render('pages/userCommentListPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
@@ -343,7 +341,7 @@ exports.userScriptListPage = function(req, res, next) {
 
   User.findOne({
     name: username
-  }, function (err, userData) {
+  }, function(err, userData) {
     if (err || !userData) { return next(); }
 
     //
@@ -369,7 +367,7 @@ exports.userScriptListPage = function(req, res, next) {
     var scriptListQuery = Script.find();
 
     // scriptListQuery: author=user
-    scriptListQuery.find({_authorId: user._id});
+    scriptListQuery.find({ _authorId: user._id });
 
     // scriptListQuery: Defaults
     modelQuery.applyScriptListQueryDefaults(scriptListQuery, options, req);
@@ -393,20 +391,20 @@ exports.userScriptListPage = function(req, res, next) {
     tasks = tasks.concat(getUserPageTasks(options));
 
     //---
-    function preRender(){
+    function preRender() {
       // scriptList
       options.scriptList = _.map(options.scriptList, modelParser.parseScript);
 
       // Pagination
       options.paginationRendered = pagination.renderDefault(req);
     };
-    function render(){ res.render('pages/userScriptListPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function render() { res.render('pages/userScriptListPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
 
-exports.userEditProfilePage = function (req, res, next) {
+exports.userEditProfilePage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) { return res.redirect('/login'); }
@@ -415,7 +413,7 @@ exports.userEditProfilePage = function (req, res, next) {
 
   User.findOne({
     name: username
-  }, function (err, userData) {
+  }, function(err, userData) {
     if (err || !userData) { return next(); }
 
     //
@@ -443,7 +441,7 @@ exports.userEditProfilePage = function (req, res, next) {
     var scriptListQuery = Script.find();
 
     // Scripts: Query: author=user
-    scriptListQuery.find({_authorId: user._id});
+    scriptListQuery.find({ _authorId: user._id });
 
     // Scripts: Query: flagged
     // Only list flagged scripts for author and user >= moderator
@@ -451,7 +449,7 @@ exports.userEditProfilePage = function (req, res, next) {
       // Show
     } else {
       // Script.flagged is undefined by default.
-      scriptListQuery.find({flagged: {$ne: true}});
+      scriptListQuery.find({ flagged: { $ne: true } });
     }
 
     //--- Tasks
@@ -463,21 +461,21 @@ exports.userEditProfilePage = function (req, res, next) {
     tasks = tasks.concat(getUserSidePanelTasks(options));
 
     //---
-    function preRender(){};
-    function render(){ res.render('pages/userEditProfilePage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function preRender() { };
+    function render() { res.render('pages/userEditProfilePage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
 
-exports.userEditPreferencesPage = function (req, res, next) {
+exports.userEditPreferencesPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) { return res.redirect('/login'); }
 
   User.findOne({
     _id: authedUser._id
-  }, function (err, userData) {
+  }, function(err, userData) {
     if (err || !userData) { return next(); }
 
     //
@@ -505,7 +503,7 @@ exports.userEditPreferencesPage = function (req, res, next) {
     var scriptListQuery = Script.find();
 
     // Scripts: Query: author=user
-    scriptListQuery.find({_authorId: user._id});
+    scriptListQuery.find({ _authorId: user._id });
 
     // Scripts: Query: flagged
     // Only list flagged scripts for author and user >= moderator
@@ -513,7 +511,7 @@ exports.userEditPreferencesPage = function (req, res, next) {
       // Show
     } else {
       // Script.flagged is undefined by default.
-      scriptListQuery.find({flagged: {$ne: true}});
+      scriptListQuery.find({ flagged: { $ne: true } });
     }
 
     //--- Tasks
@@ -521,7 +519,7 @@ exports.userEditPreferencesPage = function (req, res, next) {
     // User edit auth strategies
     tasks.push(function(callback) {
       var userStrats = user.strategies.slice(0);
-      Strategy.find({}, function (err, strats) {
+      Strategy.find({}, function(err, strats) {
         var defaultStrategy = userStrats[userStrats.length - 1];
         var strategy = null;
         var name = null;
@@ -529,15 +527,19 @@ exports.userEditPreferencesPage = function (req, res, next) {
         options.usedStrategies = [];
 
         // Get the strategies we have OAuth keys for
-        strats.forEach(function (strat) {
+        strats.forEach(function(strat) {
           if (strat.name === defaultStrategy) { return; }
 
           if (userStrats.indexOf(strat.name) > -1) {
-            options.usedStrategies.push({ 'strat' : strat.name,
-              'display' : strat.display });
+            options.usedStrategies.push({
+              'strat': strat.name,
+              'display': strat.display
+            });
           } else {
-            options.openStrategies.push({ 'strat' : strat.name,
-              'display' : strat.display });
+            options.openStrategies.push({
+              'strat': strat.name,
+              'display': strat.display
+            });
           }
         });
 
@@ -548,11 +550,15 @@ exports.userEditPreferencesPage = function (req, res, next) {
 
             if (!strategy.oauth && name !== defaultStrategy) {
               if (userStrats.indexOf(name) > -1) {
-                options.usedStrategies.push({ 'strat' : name,
-                  'display' : strategy.name });
+                options.usedStrategies.push({
+                  'strat': name,
+                  'display': strategy.name
+                });
               } else {
-                options.openStrategies.push({ 'strat' : name,
-                  'display' : strategy.name });
+                options.openStrategies.push({
+                  'strat': name,
+                  'display': strategy.name
+                });
               }
             }
           }
@@ -571,15 +577,15 @@ exports.userEditPreferencesPage = function (req, res, next) {
     // UserSidePanel tasks
     tasks = tasks.concat(getUserSidePanelTasks(options));
 
-    function preRender(){};
-    function render(){ res.render('pages/userEditPreferencesPage', options); }
-    function asyncComplete(){ preRender(); render(); }
+    function preRender() { };
+    function render() { res.render('pages/userEditPreferencesPage', options); }
+    function asyncComplete() { preRender(); render(); }
     async.parallel(tasks, asyncComplete);
   });
 };
 
 // Let a user edit their account
-exports.edit = function (req, res, next) {
+exports.edit = function(req, res, next) {
   var user = req.session.user;
   var userStrats = null;
   var options = null;
@@ -596,7 +602,7 @@ exports.edit = function (req, res, next) {
 
   req.route.params.push('author');
 
-  Strategy.find({}, function (err, strats) {
+  Strategy.find({}, function(err, strats) {
     var defaultStrategy = userStrats[userStrats.length - 1];
     var strategy = null;
     var name = null;
@@ -604,15 +610,19 @@ exports.edit = function (req, res, next) {
     options.usedStrategies = [];
 
     // Get the strategies we have OAuth keys for
-    strats.forEach(function (strat) {
+    strats.forEach(function(strat) {
       if (strat.name === defaultStrategy) { return; }
 
       if (userStrats.indexOf(strat.name) > -1) {
-        options.usedStrategies.push({ 'strat' : strat.name,
-          'display' : strat.display });
+        options.usedStrategies.push({
+          'strat': strat.name,
+          'display': strat.display
+        });
       } else {
-        options.openStrategies.push({ 'strat' : strat.name,
-          'display' : strat.display });
+        options.openStrategies.push({
+          'strat': strat.name,
+          'display': strat.display
+        });
       }
     });
 
@@ -623,11 +633,15 @@ exports.edit = function (req, res, next) {
 
         if (!strategy.oauth && name !== defaultStrategy) {
           if (userStrats.indexOf(name) > -1) {
-            options.usedStrategies.push({ 'strat' : name,
-              'display' : strategy.name });
+            options.usedStrategies.push({
+              'strat': name,
+              'display': strategy.name
+            });
           } else {
-            options.openStrategies.push({ 'strat' : name,
-              'display' : strategy.name });
+            options.openStrategies.push({
+              'strat': name,
+              'display': strategy.name
+            });
           }
         }
       }
@@ -638,15 +652,15 @@ exports.edit = function (req, res, next) {
 
     scriptsList.listScripts({ _authorId: user._id, isLib: null, flagged: null },
       { size: -1 }, '/user/edit',
-      function (scriptsList) {
+      function(scriptsList) {
         scriptsList.edit = true;
         options.scriptsList = scriptsList;
         res.render('userEdit', options);
-    });
+      });
   });
 };
 
-exports.newScriptPage = function (req, res, next) {
+exports.newScriptPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -678,7 +692,7 @@ exports.newScriptPage = function (req, res, next) {
   });
 };
 
-exports.newLibraryPage = function (req, res, next) {
+exports.newLibraryPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -710,7 +724,7 @@ exports.newLibraryPage = function (req, res, next) {
   });
 };
 
-exports.userGitHubRepoListPage = function (req, res, next) {
+exports.userGitHubRepoListPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -736,8 +750,7 @@ exports.userGitHubRepoListPage = function (req, res, next) {
   pagination.itemsPerPage = 30; // GitHub Default
 
   //--- Tasks
-
-  tasks.push(function(callback){
+  tasks.push(function(callback) {
     async.waterfall([
 
       // githubUser
@@ -771,7 +784,7 @@ exports.userGitHubRepoListPage = function (req, res, next) {
       //   callback(null, githubRepoList);
       // },
       function(githubRepoList, callback) {
-        _.each(githubRepoList, function(githubRepo){
+        _.each(githubRepoList, function(githubRepo) {
           var url = authedUser.userGitHubRepoPageUrl;
           url = helpers.updateUrlQueryString(url, {
             user: options.githubUser.login,
@@ -802,7 +815,7 @@ exports.userGitHubRepoListPage = function (req, res, next) {
   });
 };
 
-exports.userGitHubImportScriptPage = function (req, res, next) {
+exports.userGitHubImportScriptPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -831,14 +844,14 @@ exports.userGitHubImportScriptPage = function (req, res, next) {
   async.waterfall([
 
     // Validate blob
-    function(callback){
+    function(callback) {
       github.gitdata.getJavascriptBlobs({
         user: encodeURIComponent(githubUserId),
         repo: encodeURIComponent(githubRepoName),
       }, callback);
     },
-    function(javascriptBlobs, callback){
-      var javascriptBlob = _.findWhere(javascriptBlobs, {path: githubBlobPath});
+    function(javascriptBlobs, callback) {
+      var javascriptBlob = _.findWhere(javascriptBlobs, { path: githubBlobPath });
 
       javascriptBlob = parseJavascriptBlob(javascriptBlob);
 
@@ -850,19 +863,19 @@ exports.userGitHubImportScriptPage = function (req, res, next) {
     },
 
     //
-    function(callback){
+    function(callback) {
       github.usercontent.getBlobAsUtf8({
         user: encodeURIComponent(githubUserId),
         repo: encodeURIComponent(githubRepoName),
         path: encodeURIComponent(githubBlobPath),
       }, callback);
     },
-    function(blobUtf8, callback){
+    function(blobUtf8, callback) {
       // Double check file size.
       if (blobUtf8.length > settings.maximum_upload_script_size)
         return callback(util.format('File size is larger than maximum (%s bytes).', settings.maximum_upload_script_size));
 
-      var onScriptStored = function(script){
+      var onScriptStored = function(script) {
         if (script) {
           options.script = script;
           callback(null);
@@ -904,7 +917,7 @@ exports.userGitHubImportScriptPage = function (req, res, next) {
   });
 };
 
-exports.userGitHubRepoPage = function (req, res, next) {
+exports.userGitHubRepoPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -944,15 +957,15 @@ exports.userGitHubRepoPage = function (req, res, next) {
 
   //--- Tasks
 
-  tasks.push(function(callback){
+  tasks.push(function(callback) {
     async.waterfall([
-      function(callback){
+      function(callback) {
         github.repos.get({
           user: encodeURIComponent(githubUserId),
           repo: encodeURIComponent(githubRepoName),
         }, callback);
       },
-      function(repo, callback){
+      function(repo, callback) {
         options.repo = repo;
 
         github.gitdata.getJavascriptBlobs({
@@ -960,9 +973,9 @@ exports.userGitHubRepoPage = function (req, res, next) {
           repo: encodeURIComponent(repo.name),
         }, callback);
       },
-      function(javascriptBlobs, callback){
+      function(javascriptBlobs, callback) {
         options.javascriptBlobs = javascriptBlobs;
-        _.each(javascriptBlobs, function(javascriptBlob){
+        _.each(javascriptBlobs, function(javascriptBlob) {
           // Urls
           javascriptBlob.userGitHubImportPageUrl = helpers.updateUrlQueryString(authedUser.userGitHubImportPageUrl, {
             user: githubUserId,
@@ -1019,7 +1032,7 @@ var parseJavascriptBlob = function(javascriptBlob) {
 };
 
 // Sloppy code to let a user add scripts to their acount
-exports.userManageGitHubPage = function (req, res, next) {
+exports.userManageGitHubPage = function(req, res, next) {
   var authedUser = req.session.user;
 
   if (!authedUser) return res.redirect('/login');
@@ -1040,12 +1053,12 @@ exports.userManageGitHubPage = function (req, res, next) {
 
   //
   var TOO_MANY_SCRIPTS = 'GitHub user has too many scripts to batch import.';
-  tasks.push(function(callback){
+  tasks.push(function(callback) {
     var githubUserName = req.query.user || authedUser.ghUsername;
 
     async.waterfall([
       // authedUser.ghUsername
-      function(callback){
+      function(callback) {
         if (githubUserName || authedUser.ghUsername) {
           callback(null);
         } else {
@@ -1076,7 +1089,7 @@ exports.userManageGitHubPage = function (req, res, next) {
         }
       },
       // Fetch repos and format for template.
-      function(callback){
+      function(callback) {
         console.log(githubUserName);
         var repoManager = RepoManager.getManager(githubUserName, authedUser);
         repoManager.fetchRecentRepos(function() {
@@ -1088,10 +1101,10 @@ exports.userManageGitHubPage = function (req, res, next) {
         });
       },
       // Import repos.
-      function(repos, callback){
+      function(repos, callback) {
         var loadable = {};
         console.log(req.body);
-        _.each(req.body, function(repo, reponame){
+        _.each(req.body, function(repo, reponame) {
           // Load all scripts in the repo
           if (typeof repo === 'string' && reponame.substr(-4) === '_all') {
             reponame = repo;
@@ -1117,7 +1130,7 @@ exports.userManageGitHubPage = function (req, res, next) {
         if (_.size(loadable) > 0) {
           console.log('loadScripts');
           var githubUserName = authedUser.ghUsername;
-          RepoManager.getManager(githubUserName, authedUser, loadable).loadScripts(function () {
+          RepoManager.getManager(githubUserName, authedUser, loadable).loadScripts(function() {
             console.log('preredirect');
             res.redirect(authedUser.userScriptListPageUrl);
             console.log('redirect');
@@ -1132,7 +1145,7 @@ exports.userManageGitHubPage = function (req, res, next) {
 
 
   //---
-  async.parallel(tasks, function(err){
+  async.parallel(tasks, function(err) {
     if (err) {
       return statusCodePage(req, res, next, {
         statusMessage: err,
@@ -1144,7 +1157,7 @@ exports.userManageGitHubPage = function (req, res, next) {
   });
 };
 
-exports.uploadScript = function (req, res, next) {
+exports.uploadScript = function(req, res, next) {
   var user = req.session.user;
   var isLib = req.route.params.isLib;
   var userjsRegex = /\.user\.js$/;
@@ -1157,7 +1170,7 @@ exports.uploadScript = function (req, res, next) {
   }
 
   form = new formidable.IncomingForm();
-  form.parse(req, function (err, fields, files) {
+  form.parse(req, function(err, fields, files) {
     var script = files.script;
     var stream = null;
     var bufs = [];
@@ -1170,37 +1183,37 @@ exports.uploadScript = function (req, res, next) {
     }
 
     stream = fs.createReadStream(script.path);
-    stream.on('data', function (d) { bufs.push(d); });
+    stream.on('data', function(d) { bufs.push(d); });
 
-    stream.on('end', function () {
-      User.findOne({ _id: user._id }, function (err, user) {
+    stream.on('end', function() {
+      User.findOne({ _id: user._id }, function(err, user) {
         var scriptName = fields.script_name;
         if (isLib) {
           scriptStorage.storeScript(user, scriptName, Buffer.concat(bufs),
-            function (script) {
+            function(script) {
               if (!script) { return res.redirect(failUrl); }
 
               res.redirect('/libs/' + encodeURI(script.installName
                 .replace(jsRegex, '')));
             });
-          } else {
-            scriptStorage.getMeta(bufs, function (meta) {
-              scriptStorage.storeScript(user, meta, Buffer.concat(bufs),
-                function (script) {
-                  if (!script) { return res.redirect(failUrl); }
-
-                  res.redirect('/scripts/' + encodeURI(script.installName
-                    .replace(userjsRegex, '')));
-                });
-            });
-          }
+        } else {
+          scriptStorage.getMeta(bufs, function(meta) {
+            scriptStorage.storeScript(user, meta, Buffer.concat(bufs),
+              function(script) {
+                if (!script) { return res.redirect(failUrl); }
+
+                res.redirect('/scripts/' + encodeURI(script.installName
+                  .replace(userjsRegex, '')));
+              });
+          });
+        }
       });
     });
   });
 };
 
 // post route to update a user's account
-exports.update = function (req, res, next) {
+exports.update = function(req, res, next) {
   var user = req.session.user;
   var scriptUrls = req.body.urls ? Object.keys(req.body.urls) : '';
   var installRegex = null;
@@ -1212,28 +1225,28 @@ exports.update = function (req, res, next) {
   if (typeof req.body.about !== 'undefined') {
     // Update the about section of a user's profile
     User.findOneAndUpdate({ _id: user._id },
-      { about: req.body.about  },
-      function (err, user) {
+      { about: req.body.about },
+      function(err, user) {
         if (err) { res.redirect('/'); }
 
         req.session.user.about = user.about;
         res.redirect('/users/' + user.name);
-    });
+      });
   } else {
     // Remove scripts (currently no UI)
     installRegex = new RegExp('^\/install\/(' + username + '\/.+)$');
-    scriptUrls.forEach(function (url) {
+    scriptUrls.forEach(function(url) {
       var matches = installRegex.exec(url);
       if (matches && matches[1]) { installNames.push(matches[1]); }
     });
-    async.each(installNames, scriptStorage.deleteScript, function () {
+    async.each(installNames, scriptStorage.deleteScript, function() {
       res.redirect('/users/' + user.name);
     });
   }
 };
 
 // Submit a script through the web editor
-exports.submitSource = function (req, res, next) {
+exports.submitSource = function(req, res, next) {
   var user = req.session.user;
   var isLib = req.route.params.isLib;
   var source = null;
@@ -1245,8 +1258,8 @@ exports.submitSource = function (req, res, next) {
     var userjsRegex = /\.user\.js$/;
     var jsRegex = /\.js$/;
 
-    User.findOne({ _id: user._id }, function (err, user) {
-      scriptStorage.storeScript(user, meta, source, function (script) {
+    User.findOne({ _id: user._id }, function(err, user) {
+      scriptStorage.storeScript(user, meta, source, function(script) {
         var redirectUrl = encodeURI(script ? (script.isLib ? '/libs/'
           + script.installName.replace(jsRegex, '') : '/scripts/'
           + script.installName.replace(userjsRegex, '')) : req.body.url);
@@ -1256,20 +1269,21 @@ exports.submitSource = function (req, res, next) {
         }
 
         Script.findOne({ installName: req.body.original },
-          function (err, origScript) {
+          function(err, origScript) {
             var fork = null;
             if (err || !origScript) { return res.redirect(redirectUrl); }
 
             fork = origScript.fork || [];
-            fork.unshift({ author: origScript.author, url: origScript
-              .installName.replace(origScript.isLib ? jsRegex : userjsRegex, '')
+            fork.unshift({
+              author: origScript.author, url: origScript
+                .installName.replace(origScript.isLib ? jsRegex : userjsRegex, '')
             });
             script.fork = fork;
 
-            script.save(function (err, script) {
+            script.save(function(err, script) {
               res.redirect(redirectUrl);
             });
-        });
+          });
       });
     });
   }
@@ -1280,14 +1294,14 @@ exports.submitSource = function (req, res, next) {
   if (isLib) {
     storeScript(req.body.script_name, source);
   } else {
-    scriptStorage.getMeta([source], function (meta) {
+    scriptStorage.getMeta([source], function(meta) {
       if (!meta || !meta.name) { return res.redirect(url); }
       storeScript(meta, source);
     });
   }
 };
 
-function getExistingScript (req, options, authedUser, callback) {
+function getExistingScript(req, options, authedUser, callback) {
   options.isLib = req.route.params.isLib;
 
   if (!req.route.params.scriptname) {
@@ -1305,7 +1319,7 @@ function getExistingScript (req, options, authedUser, callback) {
     callback(options);
   } else {
     req.route.params.scriptname += options.isLib ? '.js' : '.user.js';
-    scriptStorage.getSource(req, function (script, stream) {
+    scriptStorage.getSource(req, function(script, stream) {
       var bufs = [];
       var collaborators = [];
 
@@ -1319,8 +1333,8 @@ function getExistingScript (req, options, authedUser, callback) {
         }
       }
 
-      stream.on('data', function (d) { bufs.push(d); });
-      stream.on('end', function () {
+      stream.on('data', function(d) { bufs.push(d); });
+      stream.on('end', function() {
         options.title = 'Edit ' + script.name;
         options.source = Buffer.concat(bufs).toString('utf8');
         options.original = script.installName;
@@ -1338,7 +1352,7 @@ function getExistingScript (req, options, authedUser, callback) {
   }
 }
 
-function pageMeta (options) {
+function pageMeta(options) {
   options.title = (options.title || '') + ' | OpenUserJS.org';
   options.pageMetaDescription = 'Download Userscripts to enhance your browser.';
   var pageMetaKeywords = ['userscript', 'greasemonkey'];
@@ -1348,7 +1362,7 @@ function pageMeta (options) {
   return options;
 }
 
-exports.editScript = function (req, res, next) {
+exports.editScript = function(req, res, next) {
   var authedUser = req.session.user;
 
   //
@@ -1366,15 +1380,15 @@ exports.editScript = function (req, res, next) {
 
   // Get the info and source for an existing script for the editor
   // Also works for writing a new script
-  tasks.push(function (callback) {
-    getExistingScript(req, options, authedUser, function (opts) {
+  tasks.push(function(callback) {
+    getExistingScript(req, options, authedUser, function(opts) {
       options = opts;
       callback(!opts);
     });
   });
 
   //---
-  async.parallel(tasks, function(err){
+  async.parallel(tasks, function(err) {
     if (err) return next();
 
     res.render('pages/scriptViewSourcePage', options);
@@ -1382,15 +1396,15 @@ exports.editScript = function (req, res, next) {
 };
 
 // route to flag a user
-exports.flag = function (req, res, next) {
+exports.flag = function(req, res, next) {
   var username = req.route.params.username;
   var unflag = req.route.params.unflag;
 
-  User.findOne({ name: username }, function (err, user) {
+  User.findOne({ name: username }, function(err, user) {
     var fn = flagLib[unflag && unflag === 'unflag' ? 'unflag' : 'flag'];
     if (err || !user) { return next(); }
 
-    fn(User, user, req.session.user, function (flagged) {
+    fn(User, user, req.session.user, function(flagged) {
       res.redirect('/users/' + username);
     });
   });

From e2e8763920798acfb86eca05382a79616978a40a Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 20:13:54 +0200
Subject: [PATCH 12/14] Consistency;

---
 libs/collectiveRating.js |  18 +++----
 libs/flag.js             |  42 ++++++++--------
 libs/githubClient.js     |  24 ++++-----
 libs/helpers.js          |  16 +++---
 libs/markdown.js         |   6 +--
 libs/modelParser.js      |  34 ++++++-------
 libs/modelQuery.js       |  40 ++++++++-------
 libs/modelsList.js       | 102 +++++++++++++++++++--------------------
 libs/modifySessions.js   |  36 +++++++-------
 libs/muExpress.js        |  10 ++--
 libs/passportLoader.js   |  12 ++---
 libs/passportVerify.js   |  25 +++++-----
 libs/remove.js           |  30 ++++++------
 libs/repoManager.js      |  55 +++++++++++----------
 libs/tasks.js            |   8 +--
 libs/templateHelpers.js  |  12 ++---
 16 files changed, 233 insertions(+), 237 deletions(-)

diff --git a/libs/collectiveRating.js b/libs/collectiveRating.js
index 2cd64a3c9..38e65a38a 100644
--- a/libs/collectiveRating.js
+++ b/libs/collectiveRating.js
@@ -1,14 +1,14 @@
 var Script = require('../models/script').Script;
 
-function median (values) {
+function median(values) {
   var middle = Math.floor(values.length / 2);
-  values.sort(function (a, b) { return a - b; });
+  values.sort(function(a, b) { return a - b; });
 
-  return values.length % 2 ? values[middle] : 
+  return values.length % 2 ? values[middle] :
     (values[middle - 1] + values[middle]) / 2;
 }
 
-function mean (values) {
+function mean(values) {
   var sum = 0;
   var i = 0;
   for (; i < values.length; ++i) {
@@ -21,12 +21,12 @@ function mean (values) {
 // Generate a collective rating by averaging the median and mean of
 // scripts in a group. I think this gives a more fair rating than just
 // using one of them alone.
-function getRating (scripts) {
+function getRating(scripts) {
   var ratings = null;
 
   if (scripts.length < 2) { return 0; }
 
-  ratings = scripts.map(function (script) {
+  ratings = scripts.map(function(script) {
     return script.rating;
   });
 
@@ -34,13 +34,13 @@ function getRating (scripts) {
 }
 exports.getRating = getRating;
 
-// TODO: Memoize this function with an 
+// TODO: Memoize this function with an
 // expiring cache (either memory or DB based) to
 // speed up voting and flagging
-exports.getKarma = function (user, maxKarma, callback) {
+exports.getKarma = function(user, maxKarma, callback) {
   var ratings = [];
   var karma = 0;
-  Script.find({ _authorId: user._id }, 'rating', function (err, scripts) {
+  Script.find({ _authorId: user._id }, 'rating', function(err, scripts) {
     if (err) { return callback(karma); }
 
     karm = Math.floor(getRating(scripts) / 10);
diff --git a/libs/flag.js b/libs/flag.js
index 5fab470f2..ff06d957d 100644
--- a/libs/flag.js
+++ b/libs/flag.js
@@ -7,7 +7,7 @@ var maxKarma = 10;
 // Determine whether content can be flagged by a user.
 // This is heavily commented so that my logic and
 // reasoning is documented for myself and others.
-function flaggable (model, content, user, callback) {
+function flaggable(model, content, user, callback) {
   // Not logged in.
   if (!user) { return callback(false); }
 
@@ -17,12 +17,12 @@ function flaggable (model, content, user, callback) {
   // It is not the responsibility of the community
   // to police the site administration
   if (model.modelName === 'User') {
-    return getFlag(model, content, user, function (flag) {
+    return getFlag(model, content, user, function(flag) {
       callback(content._id != user._id && content.role > 2, content, flag);
     });
   }
 
-  getAuthor(content, function (author) {
+  getAuthor(content, function(author) {
     // Content without an author shouldn't exist
     if (!author) { return callback(false); }
 
@@ -33,7 +33,7 @@ function flaggable (model, content, user, callback) {
     if (author.role < 3) { return callback(author.role > 2, author); }
 
     // You can't flag something twice
-    getFlag(model, content, user, function (flag) {
+    getFlag(model, content, user, function(flag) {
       return callback(!flag, author, flag);
     });
   });
@@ -45,13 +45,13 @@ function getFlag(model, content, user, callback) {
     'model': model.modelName,
     '_contentId': content._id,
     '_userId': user._id
-  }, function (err, flag) {
+  }, function(err, flag) {
     callback(err || !flag ? null : flag);
   });
 }
 
-function getAuthor (content, callback) {
-  User.findOne({ _id: content._authorId }, function (err, author) {
+function getAuthor(content, callback) {
+  User.findOne({ _id: content._authorId }, function(err, author) {
     // Content without an author shouldn't exist
     if (err || !author) { return callback(null); }
 
@@ -60,7 +60,7 @@ function getAuthor (content, callback) {
 }
 exports.getAuthor = getAuthor;
 
-function getThreshold (model, content, author, callback) {
+function getThreshold(model, content, author, callback) {
   // Admins can't be flagged so they have no threshold
   if (author.role < 3) { return callback(null); }
 
@@ -72,35 +72,35 @@ function getThreshold (model, content, author, callback) {
   var threshold = thresholds[model.modelName] * (author.role < 4 ? 2 : 1);
 
   // Calculate karma and add it to the threshold
-  getKarma(author, maxKarma, function (karma) {
+  getKarma(author, maxKarma, function(karma) {
     return callback(threshold + karma);
   });
 }
 exports.getThreshold = getThreshold;
 
-function saveContent (model, content, author, flags, callback) {
+function saveContent(model, content, author, flags, callback) {
   if (!content.flags) { content.flags = 0; }
   content.flags += flags;
 
   if (content.flags >= thresholds[model.modelName] * (author.role < 4 ? 2 : 1)) {
-    return getThreshold(model, content, author, function (threshold) {
+    return getThreshold(model, content, author, function(threshold) {
       content.flagged = content.flags >= threshold;
-      content.save(function (err, content) { callback(content.flagged); });
+      content.save(function(err, content) { callback(content.flagged); });
     });
   }
 
-  content.save(function (err, content) { callback(content.flagged); });
+  content.save(function(err, content) { callback(content.flagged); });
 }
 exports.saveContent = saveContent;
 
-function flag (model, content, user, author, callback) {
+function flag(model, content, user, author, callback) {
   var flag = new Flag({
     'model': model.modelName,
     '_contentId': content._id,
     '_userId': user._id
   });
 
-  flag.save(function (err, flag) {
+  flag.save(function(err, flag) {
     if (!content.flags) { content.flags = 0; }
     if (!content.flagged) { content.flagged = false; }
 
@@ -108,25 +108,25 @@ function flag (model, content, user, author, callback) {
   });
 }
 
-exports.flag = function (model, content, user, callback) {
-  flaggable(model, content, user, function (canFlag, author) {
+exports.flag = function(model, content, user, callback) {
+  flaggable(model, content, user, function(canFlag, author) {
     if (!canFlag) { return callback(false); }
 
     flag(model, content, user, author, callback);
   });
 };
 
-exports.unflag = function (model, content, user, callback) {
+exports.unflag = function(model, content, user, callback) {
   if (!user) { return callback(null); }
 
-  getFlag(model, content, user, function (flag) {
+  getFlag(model, content, user, function(flag) {
     if (!flag) { return callback(null); }
 
     if (!content.flags) { content.flags = 0; }
     if (!content.flagged) { content.flagged = false; }
 
-    function removeFlag (author) {
-      flag.remove(function (err) {
+    function removeFlag(author) {
+      flag.remove(function(err) {
         saveContent(model, content, author, user.role < 4 ? -2 : -1, callback);
       });
     }
diff --git a/libs/githubClient.js b/libs/githubClient.js
index ce9988ef9..525b471f5 100644
--- a/libs/githubClient.js
+++ b/libs/githubClient.js
@@ -6,7 +6,7 @@ var request = require('request');
 
 // Client
 var github = new GitHubApi({
-    version: "3.0.0",
+  version: "3.0.0"
 });
 module.exports = github;
 
@@ -32,12 +32,12 @@ Strategy.findOne({ name: 'github' }, function(err, strat) {
 // Util functions for the client.
 github.usercontent = github.usercontent || {};
 
-var githubGitDataGetBlobAsUtf8 = function (msg, callback) {
+var githubGitDataGetBlobAsUtf8 = function(msg, callback) {
   async.waterfall([
-    function(callback){
+    function(callback) {
       github.gitdata.getBlob(msg, callback);
     },
-    function(blob, callback){
+    function(blob, callback) {
       var content = blob.content;
       if (blob.encoding == 'base64') {
         var buf = new Buffer(content, 'base64');
@@ -49,18 +49,18 @@ var githubGitDataGetBlobAsUtf8 = function (msg, callback) {
 };
 github.gitdata.getBlobAsUtf8 = githubGitDataGetBlobAsUtf8;
 
-var githubUserContentBuildUrl = function (user, repo, path) {
+var githubUserContentBuildUrl = function(user, repo, path) {
   return util.format('https://raw.githubusercontent.com/%s/%s/HEAD/%s', user, repo, path);
 };
 github.usercontent.buildUrl = githubUserContentBuildUrl;
 
-var githubUserContentGetBlobAsUtf8 = function (msg, callback) {
+var githubUserContentGetBlobAsUtf8 = function(msg, callback) {
   async.waterfall([
-    function(callback){
+    function(callback) {
       var url = githubUserContentBuildUrl(msg.user, msg.repo, msg.path);
       request.get(url, callback);
     },
-    function(response, body, callback){
+    function(response, body, callback) {
       if (response.statusCode != 200)
         return callback(util.format('Status Code %s', response.statusCode));
 
@@ -76,16 +76,16 @@ var githubGitDataIsJavascriptBlob = function(blob) {
 };
 github.gitdata.isJavascriptBlob = githubGitDataIsJavascriptBlob;
 
-var githubGitDataGetJavascriptBlobs = function (msg, callback) {
+var githubGitDataGetJavascriptBlobs = function(msg, callback) {
   async.waterfall([
-    function(callback){
+    function(callback) {
       msg.sha = 'HEAD';
       msg.recursive = true;
       github.gitdata.getTree(msg, callback);
     },
-    function(repoTree, callback){
+    function(repoTree, callback) {
       var entries = repoTree.tree;
-      var blobs = _.where(entries, {type: 'blob'});
+      var blobs = _.where(entries, { type: 'blob' });
       var javascriptBlobs = _.filter(blobs, githubGitDataIsJavascriptBlob);
       callback(null, javascriptBlobs);
     },
diff --git a/libs/helpers.js b/libs/helpers.js
index 71ee6b685..19bae079a 100644
--- a/libs/helpers.js
+++ b/libs/helpers.js
@@ -22,12 +22,12 @@ var day = hour * 24;
 var week = day * 7;
 
 // Get a formatted date that can be used everywhere a date is displayed
-exports.formatDate = function (date) {
+exports.formatDate = function(date) {
   var difference = new Date().getTime() - date.getTime();
   var ret = '';
   var days = 0;
 
-  function pluralize (number, unit) {
+  function pluralize(number, unit) {
     return number + ' ' + unit + (number > 1 ? 's' : '') + ' ago';
   }
 
@@ -54,12 +54,12 @@ exports.formatDate = function (date) {
 }
 
 // Create an object with no properties
-exports.nil = function (obj) {
+exports.nil = function(obj) {
   var nilObj = Object.create(null);
 
   if (!obj) return nilObj;
 
-  exports.forIn(obj, function (val, key) {
+  exports.forIn(obj, function(val, key) {
     nilObj[key] = val;
   });
 
@@ -67,7 +67,7 @@ exports.nil = function (obj) {
 };
 
 // Safely iterate on an object not create using nil()
-exports.forIn = function (obj, forProp) {
+exports.forIn = function(obj, forProp) {
   var key = null;
 
   for (key in obj) {
@@ -78,9 +78,9 @@ exports.forIn = function (obj, forProp) {
 
 // Clean filenames but leave them readable
 // Based on Greasemonkey modules/remoteScript.js
-exports.cleanFilename = function (filename, defaultName) {
+exports.cleanFilename = function(filename, defaultName) {
   // Blacklist problem characters (slashes, colons, etc.).
-  var cleanName = (filename || '').replace(/[\\\/:*?\'\"<>|#;@=&]/g, '')
+  var cleanName = (filename || '').replace(/[\\\/:*?\'\"<>|#;@=&]/g, '');
 
   // Make whitespace readable.
   .replace(/(\s|%20)+/g, '_');
@@ -107,7 +107,7 @@ exports.setUrlQueryValue = setUrlQueryValue;
 
 exports.updateUrlQueryString = function(baseUrl, dict) {
   var url = baseUrl;
-  _.each(dict, function(value, key){
+  _.each(dict, function(value, key) {
     url = setUrlQueryValue(url, key, value);
   });
   return url;
diff --git a/libs/markdown.js b/libs/markdown.js
index a911a1777..8d90176a4 100644
--- a/libs/markdown.js
+++ b/libs/markdown.js
@@ -4,7 +4,7 @@ var xss = require('simple-xss');
 var renderer = new marked.Renderer();
 
 // Automatically generate an anchor for each header
-renderer.heading = function (text, level) {
+renderer.heading = function(text, level) {
   var escapedText = text.toLowerCase().replace(/<\/?[^>]+?>/g, '')
     .replace(/[^\w]+/g, '-');
 
@@ -21,7 +21,7 @@ renderer.heading = function (text, level) {
 
 // Set the options to use for rendering markdown
 marked.setOptions({
-  highlight: function (code, lang) {
+  highlight: function(code, lang) {
     if (lang && hljs.getLanguage(lang)) {
       return hljs.highlight(lang, code).value;
     } else {
@@ -38,6 +38,6 @@ marked.setOptions({
   smartypants: false
 });
 
-exports.renderMd = function (text) {
+exports.renderMd = function(text) {
   return xss(marked(text));
 };
diff --git a/libs/modelParser.js b/libs/modelParser.js
index 0ece77323..bf6210d52 100644
--- a/libs/modelParser.js
+++ b/libs/modelParser.js
@@ -17,19 +17,19 @@ var parseModelFnMap = {};
  */
 
 moment.lang('en', {
-  relativeTime : {
+  relativeTime: {
     future: "in %s",
-    past:   "%s ago",
-    s:  function(number, withoutSuffix, key, isFuture){ return number + "s"; },
-    m:  "1m",
+    past: "%s ago",
+    s: function(number, withoutSuffix, key, isFuture) { return number + "s"; },
+    m: "1m",
     mm: "%dm",
-    h:  "1h",
+    h: "1h",
     hh: "%dh",
-    d:  "1D",
+    d: "1D",
     dd: "%dD",
-    M:  "1M",
+    M: "1M",
     MM: "%dM",
-    y:  "1Y",
+    y: "1Y",
     yy: "%dY"
   }
 });
@@ -85,7 +85,7 @@ var parseScript = function(scriptData) {
 
   // Author
   if (_.isString(script.author)) {
-    script.author = parseUser({name: script.author});
+    script.author = parseUser({ name: script.author });
   }
 
   // Icons
@@ -128,7 +128,7 @@ var parseScript = function(scriptData) {
   // Urls: Issues
   var slug = (script.isLib ? 'libs' : 'scripts');
   slug += '/' + script.author.slug.toLowerCase();
-  slug += script.meta.namespace ?  '/' + script.namespaceSlug : '';
+  slug += script.meta.namespace ? '/' + script.namespaceSlug : '';
   slug += '/' + script.nameSlug;
   script.issuesCategorySlug = slug + '/issues';
   script.scriptIssuesPageUrl = '/' + script.issuesCategorySlug;
@@ -216,16 +216,16 @@ var parseGroup = function(groupData) {
 
   // Wait two hours between group rating updates
   // This calculation runs in the background
-  if (new Date().getTime() > (group.updated.getTime() + 1000*60*60*2)) {
+  if (new Date().getTime() > (group.updated.getTime() + 1000 * 60 * 60 * 2)) {
     Script.find({
       _id: { $in: group._scriptIds }
-    }, function (err, scripts) {
+    }, function(err, scripts) {
       if (!err && scripts.length > 1) {
         group.rating = getRating(scripts);
       }
 
       group.updated = new Date();
-      group.save(function(err, group){
+      group.save(function(err, group) {
         console.log(util.format('Group(%s) Rating Updated', group.name));
       });
     });
@@ -258,7 +258,7 @@ var parseDiscussion = function(discussionData) {
     recentCommentors.push(discussion.author);
   if (discussion.lastCommentor != discussion.author)
     recentCommentors.push(discussion.lastCommentor);
-  recentCommentors = _.map(recentCommentors, function(username){
+  recentCommentors = _.map(recentCommentors, function(username) {
     return {
       name: username,
     };
@@ -309,7 +309,6 @@ exports.renderComment = function(comment) {
   comment.contentRendered = renderMd(comment.content);
 };
 
-
 /**
  * Category
  */
@@ -328,7 +327,6 @@ var parseCategory = function(categoryData) {
 parseModelFnMap.Category = parseCategory;
 exports.parseCategory = parseCategory;
 
-
 /**
  * Remove
  */
@@ -337,7 +335,7 @@ var getRemovedItemDescription = function(remove) {
   if (!remove.content)
     return 'No content';
 
-  switch(remove.model) {
+  switch (remove.model) {
     case 'User':
       return remove.content.name;
     case 'Script':
@@ -360,7 +358,7 @@ var parseRemovedItem = function(removedItemData) {
   parseDateProperty(removedItem, 'removed');
 
   // User
-  removedItem.remover = parseUser({name: removedItem.removerName});
+  removedItem.remover = parseUser({ name: removedItem.removerName });
 
   // Content
   var parseModelFn = parseModelFnMap[removedItem.model];
diff --git a/libs/modelQuery.js b/libs/modelQuery.js
index 2f559f187..f47ec4e48 100644
--- a/libs/modelQuery.js
+++ b/libs/modelQuery.js
@@ -12,7 +12,7 @@ var findOrDefaultIfNull = function(query, key, value, defaultValue) {
     condition[key] = null;
     conditions.push(condition);
   }
-  query.and({$or: conditions});
+  query.and({ $or: conditions });
 };
 exports.findOrDefaultIfNull = findOrDefaultIfNull;
 
@@ -40,29 +40,29 @@ var parseSearchConditions = function(q, prefixSearchFields, fullSearchFields) {
   var fullStr = '';
   var prefixRegex = null;
   var fullRegex = null;
-  var terms = q.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1').split(/\s+/).map(function (e) { return e.trim(); });
+  var terms = q.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, '\\$1').split(/\s+/).map(function(e) { return e.trim(); });
 
   // Match all the terms but in any order
-  terms.forEach(function (term) {
+  terms.forEach(function(term) {
     var isNonASCII = /^\W/.test(term);
     if (isNonASCII) {
-      prefixStr += '(?=.*?([ \n\r\t.,\'"\+!?-]+)' + term  + ')';
+      prefixStr += '(?=.*?([ \n\r\t.,\'"\+!?-]+)' + term + ')';
     } else {
-      prefixStr += '(?=.*?\\b' + term  + ')';
+      prefixStr += '(?=.*?\\b' + term + ')';
     }
-    fullStr += '(?=.*?' + term  + ')';
+    fullStr += '(?=.*?' + term + ')';
   });
   prefixRegex = new RegExp(prefixStr, 'i');
   fullRegex = new RegExp(fullStr, 'i');
 
   // One of the searchable fields must match the conditions
-  prefixSearchFields.forEach(function (prop) {
+  prefixSearchFields.forEach(function(prop) {
     var condition = {};
     condition[prop] = prefixRegex;
     conditions.push(condition);
   });
 
-  fullSearchFields.forEach(function (prop) {
+  fullSearchFields.forEach(function(prop) {
     var condition = {};
     condition[prop] = fullRegex;
     conditions.push(condition);
@@ -126,14 +126,13 @@ var parseRemovedItemSearchQuery = function(removedItemListQuery, query) {
 };
 exports.parseCommentSearchQuery = parseCommentSearchQuery;
 
-
 var applyModelListQueryFlaggedFilter = function(modelListQuery, options, flaggedQuery) {
   // Only list flagged items if authedUser >= moderator or if authedUser owns the item.
   if (options.isYou || options.isMod) {
     // Mod
     if (flaggedQuery) {
       if (flaggedQuery == 'true') {
-        modelListQuery.and({flags: {$gt: 0 }});
+        modelListQuery.and({ flags: { $gt: 0 } });
       } else if (flaggedQuery == false) {
         // modelListQuery.and({$or: [
         //   {flags: {$exists: false}},
@@ -144,7 +143,7 @@ var applyModelListQueryFlaggedFilter = function(modelListQuery, options, flagged
   } else {
     // Hide
     // Script.flagged is undefined by default.
-    modelListQuery.and({flagged: {$ne: true}});
+    modelListQuery.and({ flagged: { $ne: true } });
   }
 };
 exports.applyModelListQueryFlaggedFilter = applyModelListQueryFlaggedFilter;
@@ -166,9 +165,8 @@ var applyModelListQueryDefaults = function(modelListQuery, options, req, default
   if (defaultOptions.filterFlaggedItems)
     applyModelListQueryFlaggedFilter(modelListQuery, options, req.query.flagged);
 
-
   // Sort
-  parseModelListSort(modelListQuery, req.query.orderBy, req.query.orderDir, function(){
+  parseModelListSort(modelListQuery, req.query.orderBy, req.query.orderDir, function() {
     modelListQuery.sort(defaultOptions.defaultSort);
   });
 
@@ -183,7 +181,7 @@ exports.applyCommentListQueryDefaults = function(commentListQuery, options, req)
     defaultSort: 'created',
     parseSearchQueryFn: parseCommentSearchQuery,
     searchBarPlaceholder: 'Search Comments',
-    filterFlaggedItems: true,
+    filterFlaggedItems: true
   });
 
   // Populate
@@ -199,7 +197,7 @@ exports.applyDiscussionListQueryDefaults = function(discussionListQuery, options
     defaultSort: '-updated -rating',
     parseSearchQueryFn: parseDiscussionSearchQuery,
     searchBarPlaceholder: 'Search Topics',
-    filterFlaggedItems: true,
+    filterFlaggedItems: true
   });
 };
 
@@ -208,7 +206,7 @@ exports.applyGroupListQueryDefaults = function(groupListQuery, options, req) {
     defaultSort: '-rating name',
     parseSearchQueryFn: parseGroupSearchQuery,
     searchBarPlaceholder: 'Search Groups',
-    filterFlaggedItems: true,
+    filterFlaggedItems: true
   });
 };
 
@@ -217,7 +215,7 @@ var scriptListQueryDefaults = {
   parseSearchQueryFn: parseScriptSearchQuery,
   searchBarPlaceholder: 'Search Scripts',
   searchBarFormAction: '/',
-  filterFlaggedItems: true,
+  filterFlaggedItems: true
 };
 exports.scriptListQueryDefaults = scriptListQueryDefaults;
 exports.applyScriptListQueryDefaults = function(scriptListQuery, options, req) {
@@ -230,9 +228,9 @@ var libraryListQueryDefaults = {
   searchBarPlaceholder: 'Search Libraries',
   searchBarFormAction: '/',
   searchBarFormHiddenVariables: [
-    {name: 'library', value: 'true'},
+    { name: 'library', value: 'true' },
   ],
-  filterFlaggedItems: true,
+  filterFlaggedItems: true
 };
 exports.libraryListQueryDefaults = libraryListQueryDefaults;
 exports.applyLibraryListQueryDefaults = function(libraryListQuery, options, req) {
@@ -244,7 +242,7 @@ exports.applyUserListQueryDefaults = function(userListQuery, options, req) {
     defaultSort: 'name',
     parseSearchQueryFn: parseUserSearchQuery,
     searchBarPlaceholder: 'Search Users',
-    filterFlaggedItems: true,
+    filterFlaggedItems: true
   });
 };
 
@@ -253,6 +251,6 @@ exports.applyRemovedItemListQueryDefaults = function(removedItemListQuery, optio
     defaultSort: '-removed',
     parseSearchQueryFn: parseRemovedItemSearchQuery,
     searchBarPlaceholder: 'Search Removed Items',
-    filterFlaggedItems: false,
+    filterFlaggedItems: false
   });
 };
diff --git a/libs/modelsList.js b/libs/modelsList.js
index bf93a5e5c..1578872a8 100644
--- a/libs/modelsList.js
+++ b/libs/modelsList.js
@@ -10,9 +10,9 @@ var formatDate = require('./helpers').formatDate;
 var listSize = 10;
 
 // /scriptlist/size/:size/sort/:orderBy/dir/:direction/page/:page
-// Get a list of scripts and build the options object 
+// Get a list of scripts and build the options object
 // for the corresponding Mustache partial template
-exports.listScripts = function (query, params, baseUrl, callback) {
+exports.listScripts = function(query, params, baseUrl, callback) {
 
   // Don't list flagged scripts by default
   if (query.flagged === null) {
@@ -30,7 +30,7 @@ exports.listScripts = function (query, params, baseUrl, callback) {
   }
 
   listModels(Script, query, params, ['rating', 'installs', 'updated'],
-    function (scripts, scriptsList) {
+    function(scripts, scriptsList) {
       /*var headings = {
         'name': { label: 'Name', width: 50 },
         'author': { label: 'Author', width: 15 },
@@ -41,10 +41,10 @@ exports.listScripts = function (query, params, baseUrl, callback) {
       var name = null;
       scriptsList.scripts = [];
       scriptsList.headings = [];
-      scriptsList.hasAuthor = params[4] ? 
+      scriptsList.hasAuthor = params[4] ?
         params[4].indexOf('author') === -1 : true;
 
-      scripts.forEach(function (script) {
+      scripts.forEach(function(script) {
         var isLib = script.isLib || false;
         var scriptPath = script.installName
           .replace(isLib ? /\.js$/ : /\.user\.js$/, '');
@@ -52,7 +52,7 @@ exports.listScripts = function (query, params, baseUrl, callback) {
 
         editUrl.shift();
 
-        scriptsList.scripts.push({ 
+        scriptsList.scripts.push({
           name: script.name,
           author: script.author,
           description: script.meta.description || '',
@@ -72,7 +72,7 @@ exports.listScripts = function (query, params, baseUrl, callback) {
         heading = headings[name];
 
         if (orderBy === name) {
-          heading.direction = '/dir/' + 
+          heading.direction = '/dir/' +
             (direction === 'asc' ? 'desc' : 'asc');
         } else {
           heading.direction = '';
@@ -82,22 +82,22 @@ exports.listScripts = function (query, params, baseUrl, callback) {
         scriptsList.headings.push(heading);
       }*/
 
-      scriptsList.baseUrl = baseUrl + (query.isLib === true ? 
+      scriptsList.baseUrl = baseUrl + (query.isLib === true ?
         '/liblist' : '/scriptlist');
       callback(scriptsList);
-  });
+    });
 };
 
 // /userlist/size/:size/sort/:orderBy/dir/:direction/page/:page
-// Get a list of users and build the options object 
+// Get a list of users and build the options object
 // for the corresponding Mustache partial template
-exports.listUsers = function (query, params, baseUrl, callback) {
+exports.listUsers = function(query, params, baseUrl, callback) {
   listModels(User, query, params, ['name'],
-    function (users, usersList) {
+    function(users, usersList) {
       usersList.users = [];
 
-      users.forEach(function (user) {
-        usersList.users.push({ 
+      users.forEach(function(user) {
+        usersList.users.push({
           name: user.name,
           url: '/users/' + user.name,
         });
@@ -105,30 +105,30 @@ exports.listUsers = function (query, params, baseUrl, callback) {
 
       usersList.baseUrl = baseUrl + '/userlist';
       callback(usersList);
-  });
+    });
 };
 
 // /list/size/:size/sort/:orderBy/dir/:direction/page/:page
-// Get a list of removed content and build the options object 
+// Get a list of removed content and build the options object
 // for the corresponding Mustache partial template
-exports.listRemoved = function (query, params, baseUrl, callback) {
+exports.listRemoved = function(query, params, baseUrl, callback) {
   listModels(Remove, query, params, ['removed'],
-    function (results, removedList) {
+    function(results, removedList) {
       removedList.removed = [];
 
-      results.forEach(function (result) {
+      results.forEach(function(result) {
         var content = result.content;
         var key = null;
         var contentArr = [];
         var val = null;
-        
+
         for (key in content) {
           val = content[key];
           val = val && typeof val === 'object' ? JSON.stringify(val) : val;
           contentArr.push({ 'key': key, 'value': val });
         }
 
-        removedList.removed.push({ 
+        removedList.removed.push({
           remover: result.removerName,
           removed: formatDate(result.removed),
           reason: result.reason,
@@ -138,19 +138,19 @@ exports.listRemoved = function (query, params, baseUrl, callback) {
 
       removedList.baseUrl = baseUrl + '/list';
       callback(removedList);
-  });
+    });
 };
 
 // /groups/list/size/:size/sort/:orderBy/dir/:direction/page/:page
-// Get a list of groups and build the options object 
+// Get a list of groups and build the options object
 // for the corresponding Mustache partial template
-exports.listGroups = function (query, params, baseUrl, callback) {
+exports.listGroups = function(query, params, baseUrl, callback) {
   listModels(Group, query, params, ['rating'],
-    function (groups, groupsList) {
+    function(groups, groupsList) {
       groupsList.groups = [];
 
-      groups.forEach(function (group) {
-        groupsList.groups.push({ 
+      groups.forEach(function(group) {
+        groupsList.groups.push({
           name: group.name,
           url: '/group/' + group.name.replace(/\s+/g, '_'),
           size: group._scriptIds.length,
@@ -159,34 +159,34 @@ exports.listGroups = function (query, params, baseUrl, callback) {
 
         // Wait two hours between group rating updates
         // This calculation runs in the background
-        if (new Date().getTime() > (group.updated.getTime() + 1000*60*60*2)) {
+        if (new Date().getTime() > (group.updated.getTime() + 1000 * 60 * 60 * 2)) {
           Script.find({ _id: { $in: group._scriptIds } },
-            function (err, scripts) {
+            function(err, scripts) {
               if (!err && scripts.length > 1) {
                 group.rating = getRating(scripts);
               }
 
               group.updated = new Date();
-              group.save(function () {});
-          });
+              group.save(function() { });
+            });
         }
       });
 
       groupsList.baseUrl = baseUrl + '/list';
       callback(groupsList);
-  });
+    });
 };
 
 // /list/size/:size/sort/:orderBy/dir/:direction/page/:page
-// Get a list of discussions and build the options object 
+// Get a list of discussions and build the options object
 // for the corresponding Mustache partial template
-exports.listDiscussions = function (query, params, baseUrl, callback) {
+exports.listDiscussions = function(query, params, baseUrl, callback) {
   listModels(Discussion, query, params, ['updated', 'rating'],
-    function (discussions, discussionsList) {
+    function(discussions, discussionsList) {
       discussionsList.discussions = [];
 
-      discussions.forEach(function (discussion) {
-        discussionsList.discussions.push({ 
+      discussions.forEach(function(discussion) {
+        discussionsList.discussions.push({
           topic: discussion.topic,
           comments: discussion.comments,
           author: discussion.author,
@@ -202,19 +202,19 @@ exports.listDiscussions = function (query, params, baseUrl, callback) {
 
       discussionsList.baseUrl = baseUrl + '/list';
       callback(discussionsList);
-  });
+    });
 };
 
 // /list/size/:size/sort/:orderBy/dir/:direction/page/:page
-// Get a list of comments and build the options object 
+// Get a list of comments and build the options object
 // for the corresponding Mustache partial template
-exports.listComments = function (query, params, baseUrl, callback) {
+exports.listComments = function(query, params, baseUrl, callback) {
   listModels(Comment, query, params, ['created'],
-    function (comments, commentsList) {
+    function(comments, commentsList) {
       commentsList.comments = [];
 
-      comments.forEach(function (comment) {
-        commentsList.comments.push({ 
+      comments.forEach(function(comment) {
+        commentsList.comments.push({
           author: comment.author,
           content: renderMd(comment.content),
           created: formatDate(comment.created),
@@ -225,14 +225,14 @@ exports.listComments = function (query, params, baseUrl, callback) {
 
       commentsList.baseUrl = baseUrl + '/list';
       callback(commentsList);
-  });
+    });
 };
 
-// options = { 
+// options = {
 //   size: (Number), orderBy: (String or Array or Object),
 //   direction: (String), page: (Number), omit: (Array)
 // }
-function listModels (model, query, options, defaultOrder, callback) {
+function listModels(model, query, options, defaultOrder, callback) {
   var optArr = null;
   var fields = Object.keys(model.schema.tree);
   var orderBy = null;
@@ -265,8 +265,8 @@ function listModels (model, query, options, defaultOrder, callback) {
       .instance === 'String' ? 1 : -1;
     params.sort[orderBy] = direction;
   } else if (orderBy instanceof Array) {
-    orderBy.forEach(function (order) {
-      params.sort[order] = -1 !== fields.indexOf(order) && 
+    orderBy.forEach(function(order) {
+      params.sort[order] = -1 !== fields.indexOf(order) &&
         model.schema.paths[order].instance === 'String' ? 1 : -1;
     });
   } else if (typeof orderBy === 'object') {
@@ -281,7 +281,7 @@ function listModels (model, query, options, defaultOrder, callback) {
   }
 
   if (options.omit instanceof Array) {
-    options.omit.forEach(function (field) {
+    options.omit.forEach(function(field) {
       var index = fields.indexOf(field);
       if (index > -1) { fields.splice(index, 1); }
     });
@@ -295,7 +295,7 @@ function listModels (model, query, options, defaultOrder, callback) {
   }
 
   model.find(query, omit, params,
-    function (err, models) {
+    function(err, models) {
       var list = {};
       if (!models) { models = [] }
       if (size < 0) { size = models.length; }
@@ -314,5 +314,5 @@ function listModels (model, query, options, defaultOrder, callback) {
 
       if (list.next) { models.pop(); }
       callback(models, list);
-  });
+    });
 };
diff --git a/libs/modifySessions.js b/libs/modifySessions.js
index 7f8c3c449..521618335 100644
--- a/libs/modifySessions.js
+++ b/libs/modifySessions.js
@@ -1,8 +1,8 @@
 // This library allows for the modifications of user sessions
 var async = require('async');
 
-exports.init = function (store) {
-  return function (req, res, next) {
+exports.init = function(store) {
+  return function(req, res, next) {
     // http://www.senchalabs.org/connect/session.html
     // Keep a reference to the session store on the request
     // so we can access and modify its data later
@@ -12,7 +12,7 @@ exports.init = function (store) {
 };
 
 // Serialize a user model to something that can be stored in the session data
-function serializeUser (user) {
+function serializeUser(user) {
   var userObj = user.toObject();
 
   // Some things don't need to be kept in the session store
@@ -24,19 +24,19 @@ function serializeUser (user) {
 }
 
 // Add a new session id to the user model
-exports.add = function (req, user, callback) {
+exports.add = function(req, user, callback) {
   var store = req.sessionStore;
 
-  function finish (err, user) {
+  function finish(err, user) {
     req.session.user = serializeUser(user);
     callback();
   }
 
   // Remove invalid session ids from user model
   if (user.sessionIds && user.sessionIds.length > 0) {
-    async.filter(user.sessionIds, function (id, cb) {
-      store.get(id, function (err, sess) { cb(!err && sess); });
-    }, function (sessionIds) {
+    async.filter(user.sessionIds, function(id, cb) {
+      store.get(id, function(err, sess) { cb(!err && sess); });
+    }, function(sessionIds) {
       // No duplicates
       if (sessionIds.indexOf(req.sessionID) === -1) {
         sessionIds.push(req.sessionID);
@@ -52,8 +52,8 @@ exports.add = function (req, user, callback) {
 };
 
 // Remove a session id from the user model
-exports.remove = function (req, user, callback) {
-  var pos = user && user.sessionIds ? 
+exports.remove = function(req, user, callback) {
+  var pos = user && user.sessionIds ?
     user.sessionIds.indexOf(req.sessionID) : -1;
 
   delete req.session.user;
@@ -67,14 +67,14 @@ exports.remove = function (req, user, callback) {
 };
 
 // Update all sessions for a user
-exports.update = function (req, user, callback) {
+exports.update = function(req, user, callback) {
   var store = req.sessionStore;
   var userObj = user ? serializeUser(user) : null;
 
   if (!user || !user.sessionIds) { return callback('No sessions', null); }
 
-  async.each(user.sessionIds, function (id, cb) {
-    store.get(id, function (err, sess) {
+  async.each(user.sessionIds, function(id, cb) {
+    store.get(id, function(err, sess) {
       // Invalid session, will be removed on login
       if (err || !sess) { return cb(null); }
 
@@ -85,20 +85,20 @@ exports.update = function (req, user, callback) {
 };
 
 // Destory all sessions for a user
-exports.destroy = function (req, user, callback) {
+exports.destroy = function(req, user, callback) {
   var store = req.sessionStore;
-  var emptySess = { 
-    cookie: { 
+  var emptySess = {
+    cookie: {
       path: '/',
       _expires: null,
       originalMaxAge: null,
-      httpOnly: true 
+      httpOnly: true
     }
   };
 
   if (!user || !user.sessionIds) { return cb('No sessions', null); }
 
-  async.each(user.sessionIds, function (id, cb) {
+  async.each(user.sessionIds, function(id, cb) {
     store.set(id, emptySess, cb);
   }, callback);
 };
diff --git a/libs/muExpress.js b/libs/muExpress.js
index 94621b287..ecd37dc00 100644
--- a/libs/muExpress.js
+++ b/libs/muExpress.js
@@ -2,7 +2,7 @@ var mu = require('mu2');
 
 mu.root = __dirname + '/../views';
 
-function renderFile (res, path, options) {
+function renderFile(res, path, options) {
   // If you need to render a file with a different content
   // type, do it directly on the response object
   if (process.env.NODE_ENV !== 'production') { mu.clearCache(); }
@@ -12,18 +12,18 @@ function renderFile (res, path, options) {
 
 // Express doesn't have stream support for rendering templates
 // Hack express to add support for rendering a template with Mu
-exports.renderFile = function (app) {
+exports.renderFile = function(app) {
   var render = app.response.__proto__.render;
 
-  app.response.__proto__.render = function (view, options, fn) {
+  app.response.__proto__.render = function(view, options, fn) {
     var self = this;
 
     if (!fn && app.get('view engine') === 'html') {
-      fn = function (path, options) { renderFile(self, path, options); };
+      fn = function(path, options) { renderFile(self, path, options); };
     }
 
     render.call(self, view, options, fn);
   };
 
-  return (function (path, options, fn) { fn(path, options); });
+  return (function(path, options, fn) { fn(path, options); });
 };
diff --git a/libs/passportLoader.js b/libs/passportLoader.js
index c41e5e507..57684cb8e 100644
--- a/libs/passportLoader.js
+++ b/libs/passportLoader.js
@@ -12,7 +12,7 @@ exports.strategyInstances = nil();
 
 // This will load a single passport
 // Notice it is general so it can load any passport strategy
-exports.loadPassport = function (strategy) {
+exports.loadPassport = function(strategy) {
   var requireStr = 'passport-' + strategy.name;
   var PassportStrategy = require(requireStr).Strategy;
   var instance = null;
@@ -20,12 +20,12 @@ exports.loadPassport = function (strategy) {
   if (strategy.openid) {
     instance = new PassportStrategy(
       {
-        returnURL: AUTH_CALLBACK_BASE_URL  + '/auth/' + strategy.name + '/callback/',
-        realm: AUTH_CALLBACK_BASE_URL  + '/',
+        returnURL: AUTH_CALLBACK_BASE_URL + '/auth/' + strategy.name + '/callback/',
+        realm: AUTH_CALLBACK_BASE_URL + '/',
         profile: false,
         stateless: true
       },
-      function () {} // we replace this callback later (_verify)
+      function() { } // we replace this callback later (_verify)
     );
   } else {
     instance = new PassportStrategy(
@@ -35,9 +35,9 @@ exports.loadPassport = function (strategy) {
         clientID: strategy.id,
         clientSecret: strategy.key,
         state: 'a bullshit string reddit requires',
-        callbackURL: AUTH_CALLBACK_BASE_URL  + '/auth/' + strategy.name + '/callback/'
+        callbackURL: AUTH_CALLBACK_BASE_URL + '/auth/' + strategy.name + '/callback/'
       },
-      function () {} // we replace this callback later (_verify)
+      function() { } // we replace this callback later (_verify)
     );
   }
 
diff --git a/libs/passportVerify.js b/libs/passportVerify.js
index d93369b6f..ac0185170 100644
--- a/libs/passportVerify.js
+++ b/libs/passportVerify.js
@@ -5,7 +5,7 @@ var userRoles = require('../models/userRoles.json');
 
 // This is a custom verification function used for Passports because
 // we needed something more powerful than what they provided
-exports.verify = function (id, strategy, username, loggedIn, done) {
+exports.verify = function(id, strategy, username, loggedIn, done) {
   var shasum = crypto.createHash('sha256');
   var digest = null;
 
@@ -19,19 +19,19 @@ exports.verify = function (id, strategy, username, loggedIn, done) {
     digest = shasum.digest('hex');
   }
 
-  findDeadorAlive(User, { 'auths' : digest }, true,
-    function (alive, user, removed) {
+  findDeadorAlive(User, { 'auths': digest }, true,
+    function(alive, user, removed) {
       var pos = user ? user.auths.indexOf(digest) : -1;
       if (removed) { done(null, false, 'user was removed'); }
 
       if (!user) {
-        User.findOne({ 'name' : username }, function (err, user) {
+        User.findOne({ 'name': username }, function(err, user) {
           if (user && loggedIn) {
             // Add the new strategy to same account
             // This allows linking multiple external accounts to one of ours
             user.auths.push(digest);
             user.strategies.push(strategy);
-            user.save(function (err, user) {
+            user.save(function(err, user) {
               return done(err, user);
             });
           } else if (user) {
@@ -40,14 +40,14 @@ exports.verify = function (id, strategy, username, loggedIn, done) {
           } else {
             // Create a new user
             user = new User({
-              'name' : username,
-              'auths' : [digest],
-              'strategies' : [strategy],
-              'role' : userRoles.length - 1,
+              'name': username,
+              'auths': [digest],
+              'strategies': [strategy],
+              'role': userRoles.length - 1,
               'about': '',
               'ghUsername': null
             });
-            user.save(function (err, user) {
+            user.save(function(err, user) {
               return done(err, user);
             });
           }
@@ -58,12 +58,13 @@ exports.verify = function (id, strategy, username, loggedIn, done) {
         user.auths.splice(pos, 1);
         user.strategies.push(strategy);
         user.auths.push(digest);
-        user.save(function (err, user) {
+        user.save(function(err, user) {
           return done(err, user);
         });
       } else {
         // The user was authenticated
         return done(null, user);
       }
-  });
+    }
+  );
 }
diff --git a/libs/remove.js b/libs/remove.js
index 2ed954fcd..ca9135601 100644
--- a/libs/remove.js
+++ b/libs/remove.js
@@ -6,13 +6,13 @@ var async = require('async');
 var modelNames = ['Script'];
 var models = {};
 
-modelNames.forEach(function (modelName) {
+modelNames.forEach(function(modelName) {
   models[modelName] = require('../models/' +
     modelName.toLowerCase())[modelName];
 });
 
 // Determine whether content can be removed by a user.
-function removeable (model, content, user, callback) {
+function removeable(model, content, user, callback) {
   // The user must be logged in
   // The user is a moderator then the content must be flagged
   // If the user is an admin or greater then the content may be removed
@@ -27,7 +27,7 @@ function removeable (model, content, user, callback) {
       content);
   }
 
-  User.findOne({ _id: content._authorId }, function (err, author) {
+  User.findOne({ _id: content._authorId }, function(err, author) {
     // Content without an author shouldn't exist
     if (err || !author) { return callback(false); }
 
@@ -41,7 +41,7 @@ function removeable (model, content, user, callback) {
 }
 exports.removeable = removeable;
 
-function remove (model, content, user, reason, callback) {
+function remove(model, content, user, reason, callback) {
   var remove = new Remove({
     'model': model.modelName,
     'content': content.toObject(),
@@ -52,28 +52,28 @@ function remove (model, content, user, reason, callback) {
     '_removerId': user._id
   });
 
-  remove.save(function (err, remove) {
-    content.remove(function (err) { callback(remove); });
+  remove.save(function(err, remove) {
+    content.remove(function(err) { callback(remove); });
   });
 }
 
-exports.remove = function (model, content, user, reason, callback) {
-  removeable(model, content, user, function (canRemove, author) {
+exports.remove = function(model, content, user, reason, callback) {
+  removeable(model, content, user, function(canRemove, author) {
     if (!canRemove) { return callback(false); }
 
     if (model.modelName !== 'User') {
       remove(model, content, user, reason, callback);
     } else {
       // Remove all the user's content
-      async.each(modelNames, function (modelName, cb) {
+      async.each(modelNames, function(modelName, cb) {
         var model = models[modelName];
         model.find({ _authorId: content._id },
-          function (err, contentArr) {
-            async.each(contentArr, function (content, innerCb) {
+          function(err, contentArr) {
+            async.each(contentArr, function(content, innerCb) {
               remove(model, content, user, null, innerCb);
             }, cb);
           });
-      }, function () {
+      }, function() {
         remove(model, content, user, reason, callback);
       });
     }
@@ -96,10 +96,10 @@ exports.remove = function (model, content, user, reason, callback) {
 //
 // The removed parameter is the Remove document containing the content
 // and is always returned if found, regardless of permissions.
-exports.findDeadorAlive = function (model, query, user, callback) {
+exports.findDeadorAlive = function(model, query, user, callback) {
   var modelName = model.modelName;
 
-  model.findOne(query, function (err, content) {
+  model.findOne(query, function(err, content) {
     var name = null;
     var rmQuery = { model: modelName };
 
@@ -112,7 +112,7 @@ exports.findDeadorAlive = function (model, query, user, callback) {
       rmQuery['content.' + name] = query[name];
     }
 
-    Remove.findOne(rmQuery, function (err, removed) {
+    Remove.findOne(rmQuery, function(err, removed) {
       if (err || !removed) { return callback(null, null, null); }
       if (!user || (user !== true && user.role > removed.removerRole)) {
         return callback(false, null, removed);
diff --git a/libs/repoManager.js b/libs/repoManager.js
index 33b892818..56f435d8b 100644
--- a/libs/repoManager.js
+++ b/libs/repoManager.js
@@ -18,7 +18,7 @@ Strategy.findOne({ name: 'github' }, function(err, strat) {
 });
 
 // Requests a GitHub url and returns the chunks as buffers
-function fetchRaw (host, path, callback) {
+function fetchRaw(host, path, callback) {
   var options = {
     hostname: host,
     port: 443,
@@ -30,22 +30,22 @@ function fetchRaw (host, path, callback) {
   var req = https.request(options,
     function(res) {
       var bufs = [];
-      if (res.statusCode != 200) { console.log(res.statusCode);return callback([new Buffer('')]); }
+      if (res.statusCode != 200) { console.log(res.statusCode); return callback([new Buffer('')]); }
       else {
         res.on('data', function(d) { bufs.push(d); });
         res.on('end', function() {
           callback(bufs);
         });
       }
-  });
+    });
   req.end();
 }
 
 // Use for call the GitHub JSON api
 // Returns the JSON parsed object
-function fetchJSON (path, callback) {
+function fetchJSON(path, callback) {
   path += '?client_id=' + clientId + '&client_secret=' + clientKey;
-  fetchRaw('api.github.com', path, function (bufs) {
+  fetchRaw('api.github.com', path, function(bufs) {
     callback(JSON.parse(Buffer.concat(bufs).toString()));
   });
 }
@@ -58,7 +58,7 @@ function RepoManager(userId, user, repos) {
 }
 
 // Fetches the information about repos that contain user scripts
-RepoManager.prototype.fetchRecentRepos = function (callback) {
+RepoManager.prototype.fetchRecentRepos = function(callback) {
   var repoList = [];
   var that = this;
 
@@ -76,11 +76,11 @@ RepoManager.prototype.fetchRecentRepos = function (callback) {
       // to speedup this request.
       // githubRepoList = _.where(githubRepoList, {fork: false});
 
-      _.map(githubRepoList, function(githubRepo){
+      _.map(githubRepoList, function(githubRepo) {
         repoList.push(new Repo(that, githubRepo.owner.login, githubRepo.name));
       });
 
-      async.each(repoList, function (repo, callback) {
+      async.each(repoList, function(repo, callback) {
         repo.fetchUserScripts(function() {
           callback(null);
         });
@@ -90,19 +90,19 @@ RepoManager.prototype.fetchRecentRepos = function (callback) {
 };
 
 // Import scripts on GitHub
-RepoManager.prototype.loadScripts = function (callback, update) {
+RepoManager.prototype.loadScripts = function(callback, update) {
   var scriptStorage = require('../controllers/scriptStorage');
   var arrayOfRepos = this.makeRepoArray();
   var that = this;
   var scripts = [];
 
   // TODO: remove usage of makeRepoArray since it causes redundant looping
-  arrayOfRepos.forEach(function (repo) {
-    async.each(repo.scripts, function (script, cb) {
-      var url = '/' + encodeURI(repo.user)  + '/' + encodeURI(repo.repo)
+  arrayOfRepos.forEach(function(repo) {
+    async.each(repo.scripts, function(script, cb) {
+      var url = '/' + encodeURI(repo.user) + '/' + encodeURI(repo.repo)
         + '/master' + script.path;
-      fetchRaw('raw.githubusercontent.com', url, function (bufs) {
-        scriptStorage.getMeta(bufs, function (meta) {
+      fetchRaw('raw.githubusercontent.com', url, function(bufs) {
+        scriptStorage.getMeta(bufs, function(meta) {
           if (meta) {
             scriptStorage.storeScript(that.user, meta, Buffer.concat(bufs),
               cb, update);
@@ -114,7 +114,7 @@ RepoManager.prototype.loadScripts = function (callback, update) {
 }
 
 // Create the Mustache object to display repos with their user scrips
-RepoManager.prototype.makeRepoArray = function () {
+RepoManager.prototype.makeRepoArray = function() {
   var retOptions = [];
   var repos = this.repos;
   var username = this.user.ghUsername;
@@ -146,22 +146,24 @@ function Repo(manager, username, reponame) {
 }
 
 // Use recursive requests to locate all user scripts in a repo
-Repo.prototype.fetchUserScripts = function (callback) {
+Repo.prototype.fetchUserScripts = function(callback) {
   this.getTree('HEAD', '', callback);
 };
 
 // Looks for user script in the current directory
 // and initiates searches on subdirectories
-Repo.prototype.parseTree = function (tree, path, done) {
+Repo.prototype.parseTree = function(tree, path, done) {
   var object;
   var trees = [];
   var that = this;
   var repos = this.manager.repos;
 
-  tree.forEach(function (object) {
+  tree.forEach(function(object) {
     if (object.type === 'tree') {
-      trees.push({ sha: object.sha, path: path + '/'
-        + encodeURI(object.path) });
+      trees.push({
+        sha: object.sha, path: path + '/'
+          + encodeURI(object.path)
+      });
     } else if (object.path.substr(-8) === '.user.js') {
       if (!repos[that.repo]) { repos[that.repo] = nil(); }
       repos[that.repo][object.path] = path + '/' + encodeURI(object.path);
@@ -170,21 +172,22 @@ Repo.prototype.parseTree = function (tree, path, done) {
 
   async.each(trees, function(tree, cb) {
     that.getTree(tree.sha, tree.path, cb);
-  }, function () {
+  }, function() {
     done();
   });
 };
 
 // Gets information about a directory
-Repo.prototype.getTree = function (sha, path, cb) {
+Repo.prototype.getTree = function(sha, path, cb) {
   var that = this;
-  fetchJSON('/repos/' + encodeURI(this.user)  + '/' + encodeURI(this.repo)
+  fetchJSON('/repos/' + encodeURI(this.user) + '/' + encodeURI(this.repo)
     + '/git/trees/' + sha,
-    function (json) {
+    function(json) {
       that.parseTree(json.tree, path, cb);
-  });
+    }
+  );
 };
 
-exports.getManager = function (userId, user, repos) {
+exports.getManager = function(userId, user, repos) {
   return new RepoManager(userId, user, repos);
 };
diff --git a/libs/tasks.js b/libs/tasks.js
index f7dc17843..777a7936e 100644
--- a/libs/tasks.js
+++ b/libs/tasks.js
@@ -8,8 +8,8 @@ var onErr = function(err, onErrFn) {
 };
 
 exports.countTask = function(modelListQuery, dict, key, onErrFn) {
-  return function (callback) {
-    modelListQuery.model.count(modelListQuery._conditions, function(err, modelListCount){
+  return function(callback) {
+    modelListQuery.model.count(modelListQuery._conditions, function(err, modelListCount) {
       if (err) {
         onErr(err, onErrFn);
         callback();
@@ -22,8 +22,8 @@ exports.countTask = function(modelListQuery, dict, key, onErrFn) {
 };
 
 exports.execQueryTask = function(query, dict, key, onErrFn) {
-  return function (callback) {
-    query.exec(function(err, result){
+  return function(callback) {
+    query.exec(function(err, result) {
       if (err) {
         onErr(err, onErrFn);
         callback();
diff --git a/libs/templateHelpers.js b/libs/templateHelpers.js
index 9ecba939a..f78fe958c 100644
--- a/libs/templateHelpers.js
+++ b/libs/templateHelpers.js
@@ -2,7 +2,6 @@ var countTask = require('../libs/tasks').countTask;
 var helpers = require('../libs/helpers');
 var modelParser = require('../libs/modelParser');
 
-
 var paginateTemplate = function(opts) {
   // Required
   var currentPage = opts.currentPage;
@@ -16,16 +15,15 @@ var paginateTemplate = function(opts) {
 
   var linkedPages = [];
 
-  for (var i = Math.max(1, currentPage - distVisible); i <= Math.min(currentPage + distVisible, lastPage); i++)
+  for (var i = Math.max(1, currentPage - distVisible) ; i <= Math.min(currentPage + distVisible, lastPage) ; i++)
     linkedPages.push(i);
 
   if (firstVisible && linkedPages.length > 0 && linkedPages[0] != 1)
     linkedPages.splice(0, 0, 1); // insert the value 1 at index 0
 
-  if (lastVisible && linkedPages.length > 0 && linkedPages[linkedPages.length-1] != lastPage)
+  if (lastVisible && linkedPages.length > 0 && linkedPages[linkedPages.length - 1] != lastPage)
     linkedPages.push(lastPage);
 
-
   var html = '';
   html += '<ul class="pagination">';
   for (var i = 0; i < linkedPages.length; i++) {
@@ -56,7 +54,7 @@ var newPagination = function(currentPage, itemsPerPage) {
     currentPage: null,
     itemsPerPage: null,
     startIndex: null,
-    numItems: null,
+    numItems: null
   };
   pagination.applyToQuery = function(modelListQuery) {
     pagination.startIndex = (pagination.currentPage * pagination.itemsPerPage) - pagination.itemsPerPage;
@@ -79,7 +77,6 @@ var newPagination = function(currentPage, itemsPerPage) {
 };
 exports.newPagination = newPagination;
 
-
 var getDefaultPagination = function(req) {
   var pagination = newPagination(req.query.p, req.query.limit);
   pagination.renderDefault = function(req) {
@@ -93,8 +90,7 @@ var getDefaultPagination = function(req) {
 };
 exports.getDefaultPagination = getDefaultPagination;
 
-
-exports.statusCodePage = function (req, res, next, options) {
+exports.statusCodePage = function(req, res, next, options) {
   var authedUser = req.session ? req.session.user : null;
 
   //

From e1eafdb35509da1c7d0f9d80488ae03c10f211d2 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 22:38:38 +0200
Subject: [PATCH 13/14] Consistency;

---
 controllers/scriptStorage.js | 7 ++++---
 libs/templateHelpers.js      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/controllers/scriptStorage.js b/controllers/scriptStorage.js
index 12d1865ec..8f4764b6e 100644
--- a/controllers/scriptStorage.js
+++ b/controllers/scriptStorage.js
@@ -16,9 +16,11 @@ if (process.env.NODE_ENV === 'production') {
   // Then run the fakes3.sh script or: fakes3 -r fakeS3 -p 10001
   var DEV_AWS_URL = process.env.DEV_AWS_URL || 'localhost:10001';
   AWS.config.update({
-    accessKeyId: 'fakeId', secretAccessKey: 'fakeKey',
+    accessKeyId: 'fakeId',
+    secretAccessKey: 'fakeKey',
     httpOptions: {
-      proxy: DEV_AWS_URL, agent: require('http').globalAgent
+      proxy: DEV_AWS_URL,
+      agent: require('http').globalAgent
     }
   });
 }
@@ -224,7 +226,6 @@ exports.storeScript = function(user, meta, buf, callback, update) {
   // Prevent a removed script from being reuploaded
   findDeadorAlive(Script, { installName: installName }, true,
     function(alive, script, removed) {
-
       if (removed || (!script && (update || collaborators))) {
         return callback(null);
       } else if (!script) {
diff --git a/libs/templateHelpers.js b/libs/templateHelpers.js
index f78fe958c..7d0e76c7d 100644
--- a/libs/templateHelpers.js
+++ b/libs/templateHelpers.js
@@ -15,7 +15,7 @@ var paginateTemplate = function(opts) {
 
   var linkedPages = [];
 
-  for (var i = Math.max(1, currentPage - distVisible) ; i <= Math.min(currentPage + distVisible, lastPage) ; i++)
+  for (var i = Math.max(1, currentPage - distVisible); i <= Math.min(currentPage + distVisible, lastPage); i++)
     linkedPages.push(i);
 
   if (firstVisible && linkedPages.length > 0 && linkedPages[0] != 1)

From 9f8a25d220caf6e573798910b96128542aee6e36 Mon Sep 17 00:00:00 2001
From: Jeroen van Warmerdam <jeronevw@hotmail.com>
Date: Wed, 18 Jun 2014 22:47:49 +0200
Subject: [PATCH 14/14] More Consistency;

---
 controllers/admin.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/controllers/admin.js b/controllers/admin.js
index 160b81af1..d433c617c 100644
--- a/controllers/admin.js
+++ b/controllers/admin.js
@@ -34,7 +34,11 @@ function getOAuthStrategies(stored) {
     strategy = strategies[type];
     if (strategy.oauth) {
       oAuthStrats.push(stored[type] ||
-        nil({ 'strat': type, 'id': '', 'key': '' }));
+        nil({
+          'strat': type,
+          'id': '',
+          'key': ''
+        }));
     }
   }
 
@@ -57,7 +61,8 @@ exports.userAdmin = function(req, res, next) {
       var roles = [];
       userRoles.forEach(function(role, index) {
         roles.push({
-          'val': index, 'display': role,
+          'val': index,
+          'display': role,
           'selected': index === user.role
         });
       });
@@ -103,7 +108,7 @@ var jsonModelMap = {
   'Discussion': Discussion,
   'Comment': Comment,
   'Vote': Vote,
-  'Flag': Flag,
+  'Flag': Flag
 };
 // View everything about a particular user
 // This is mostly for debugging in production