diff --git a/data/css/style.css b/data/css/style.css
index 7bad398578..789f479005 100644
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -206,6 +206,9 @@ thead.tablesorter-stickyHeader {
   background-color: #dfdacf;
 }
 /* filter widget */
+.tablesorter .filtered {
+  display: none;
+}
 .tablesorter input.tablesorter-filter {
   width: 98%;
   height: auto;
@@ -981,7 +984,6 @@ td.tvShow a {
   text-decoration: none;
   display: block;
   width: 100%;
-  height: 100%;
 }
 td.tvShow:hover a {
   color:#000;
diff --git a/data/interfaces/default/config.tmpl b/data/interfaces/default/config.tmpl
index 7e8df5fc61..61f5df49f2 100644
--- a/data/interfaces/default/config.tmpl
+++ b/data/interfaces/default/config.tmpl
@@ -31,7 +31,8 @@
         <tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage </td><td><a href="http://www.sickbeard.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://www.sickbeard.com/</a></td></tr>
         <tr><td class="infoTableHeader"><i class="icon16-web"></i> Forums </td><td><a href="http://sickbeard.com/forums/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://sickbeard.com/forums/</a></td></tr>
         <tr><td class="infoTableHeader"><i class="icon16-github"></i> Source </td><td><a href="https://github.com/midgetspy/Sick-Beard/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">https://github.com/midgetspy/Sick-Beard/</a></td></tr>
-        <tr><td class="infoTableHeader"><i class="icon16-win"></i> Bug Tracker &amp;<br/> Windows Builds </td><td><a href="http://code.google.com/p/sickbeard/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://code.google.com/p/sickbeard/</a></td></tr>
+        <tr><td class="infoTableHeader"><i class="icon16-win"></i> Windows Builds </td><td><a href="https://github.com/midgetspy/Sick-Beard/releases/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">https://github.com/midgetspy/Sick-Beard/releases/</a></td></tr>
+        <tr><td class="infoTableHeader"><i class="icon16-web"></i> Bug Tracker </td><td><a href="http://code.google.com/p/sickbeard/issues/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">http://code.google.com/p/sickbeard/issues/</a></td></tr>
         <tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat </td><td><a href="irc://irc.freenode.net/#sickbeard" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;"><i>#sickbeard</i> on <i>irc.freenode.net</i></a></td></tr>
     </table>
 </div>
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
index cc9235ef18..b8c472058b 100644
--- a/data/interfaces/default/config_notifications.tmpl
+++ b/data/interfaces/default/config_notifications.tmpl
@@ -17,7 +17,7 @@
 
 
             <br />
-            <h2>Home Theater</h2>
+            <h2>Home Theater / NAS</h2>
             <br />
 
 
@@ -38,6 +38,13 @@
                         </div>
 
                         <div id="content_use_xbmc">
+                            <div class="field-pair">
+                                <input type="checkbox" name="xbmc_always_on" id="xbmc_always_on" #if $sickbeard.XBMC_ALWAYS_ON then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="xbmc_always_on">
+                                    <span class="component-title">Always On</span>
+                                    <span class="component-desc">Log errors when unreachable?</span>
+                                </label>
+                            </div>
                             <div class="field-pair">
                                 <input type="checkbox" name="xbmc_notify_onsnatch" id="xbmc_notify_onsnatch" #if $sickbeard.XBMC_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
                                 <label class="clearfix" for="xbmc_notify_onsnatch">
@@ -121,6 +128,7 @@
                         <img class="notifier-icon" src="$sbRoot/images/notifiers/plex.png" alt="" title="Plex Media Server" />
                         <h3><a href="http://www.plexapp.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Plex Media Server</a></h3>
                         <p>Experience your media on a visually stunning, easy to use interface on your Mac connected to your TV. Your media library has never looked this good!</p>
+                        <p>For sending notifications to Plex Home Theater (PHT) clients, use the XBMC notifier with port <b>3005</b>.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
@@ -165,12 +173,12 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Plex Client IP:Port</span>
+                                    <span class="component-title">Plex Media Center IP:Port</span>
                                     <input type="text" name="plex_host" id="plex_host" value="$sickbeard.PLEX_HOST" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">Host running Plex Client (eg. 192.168.1.100:3000)</span>
+                                    <span class="component-desc">Host running Plex Media Center (eg. 192.168.1.100:3000)</span>
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
@@ -179,26 +187,26 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Plex Client Username</span>
+                                    <span class="component-title">PMC Client Username</span>
                                     <input type="text" name="plex_username" id="plex_username" value="$sickbeard.PLEX_USERNAME" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">Username of your Plex client API (blank for none)</span>
+                                    <span class="component-desc">Username of your PMC client (blank for none)</span>
                                 </label>
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Plex Client Password</span>
+                                    <span class="component-title">PMC Client Password</span>
                                     <input type="password" name="plex_password" id="plex_password" value="$sickbeard.PLEX_PASSWORD" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">Password of your Plex client API (blank for none)</span>
+                                    <span class="component-desc">Password of your PMC client (blank for none)</span>
                                 </label>
                             </div>
                             <div class="testNotification" id="testPLEX-result">Click below to test.</div>
-                            <input type="button" class="btn" value="Test Plex Media Clients" id="testPLEX" />
+                            <input type="button" class="btn" value="Test PMC Clients" id="testPLEX" />
                             <input type="submit" class="btn config_submitter" value="Save Changes" />
                         </div><!-- /content_use_plex -->
 
@@ -358,17 +366,18 @@
 
                 <div class="component-group clearfix">
                     <div class="component-group-desc">
-                        <img class="notifier-icon" src="$sbRoot/images/notifiers/synoindex.png" alt="" title="Synology Indexer" />
-                        <h3><a href="http://synology.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Synology Indexer</a></h3>
+                        <img class="notifier-icon" src="$sbRoot/images/notifiers/synoindex.png" alt="" title="Synology" />
+                        <h3><a href="http://synology.com/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Synology</a></h3>
+                        <p>The Synology DiskStation NAS.</p>
                         <p>Synology Indexer is the daemon running on the Synology NAS to build its media database.</p>
+                        <p>Synology Notifier is the notification system of Synology DSM.</p>
                     </div>
-
                     <fieldset class="component-group-list">
                         <div class="field-pair">
                             <input type="checkbox" class="enabler" name="use_synoindex" id="use_synoindex" #if $sickbeard.USE_SYNOINDEX then "checked=\"checked\"" else ""# />
                             <label class="clearfix" for="use_synoindex">
                                 <span class="component-title">Enable</span>
-                                <span class="component-desc">Should Sick Beard send notifications to the synoindex daemon?<br /><br />
+                                <span class="component-desc">Should Sick Beard send Synology commands?<br /><br />
                                 </span>
                             </label>
                             <label class="nocheck clearfix" for="use_synoindex">
@@ -378,8 +387,31 @@
                         </div>
 
                         <div id="content_use_synoindex">
+                            <div class="field-pair">
+                                <input type="checkbox" name="synoindex_notify_onsnatch" id="synoindex_notify_onsnatch" #if $sickbeard.SYNOINDEX_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="synoindex_notify_onsnatch">
+                                    <span class="component-title">Notify on Snatch</span>
+                                    <span class="component-desc">Send notification when we start a download?</span>
+                                </label>
+                            </div>
+                            <div class="field-pair">
+                                <input type="checkbox" name="synoindex_notify_ondownload" id="synoindex_notify_ondownload" #if $sickbeard.SYNOINDEX_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="synoindex_notify_ondownload">
+                                    <span class="component-title">Notify on Download</span>
+                                    <span class="component-desc">Send notification when we finish a download?</span>
+                                </label>
+                            </div>
+                            <div class="field-pair">
+                                <input type="checkbox" name="synoindex_update_library" id="synoindex_update_library" #if $sickbeard.SYNOINDEX_UPDATE_LIBRARY then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="synoindex_update_library">
+                                    <span class="component-title">Update Library</span>
+                                    <span class="component-desc">Update Synology library when we finish a download?</span>
+                                </label>
+                            </div>
+                            <div class="testNotification" id="testSynoNotify-result">Click below to test.</div>
+                            <input type="button" class="btn" value="Test Notice (SynoDSMnotify)" id="testSynoNotify" />
                             <input type="submit" class="btn config_submitter" value="Save Changes" />
-                        </div><!-- /content_use_pytivo //-->
+                        </div><!-- /content_use_synoindex //-->
 
                     </fieldset>
                 </div><!-- /synoindex component-group //-->
@@ -389,14 +421,14 @@
                     <div class="component-group-desc">
                         <img class="notifier-icon" src="$sbRoot/images/notifiers/pytivo.png" alt="" title="pyTivo" />
                         <h3><a href="http://pytivo.sourceforge.net/wiki/index.php/PyTivo" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">pyTivo</a></h3>
-                        <p>pyTivo is both an HMO and GoBack server.  This notifier will load the completed downloads to your Tivo.</p>
+                        <p>pyTivo is both an HMO and GoBack server. This notifier will load the completed downloads to your Tivo.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
                             <input type="checkbox" class="enabler" name="use_pytivo" id="use_pytivo" #if $sickbeard.USE_PYTIVO then "checked=\"checked\"" else ""# />
                             <label class="clearfix" for="use_pytivo">
                                 <span class="component-title">Enable</span>
-                                <span class="component-desc">Should Sick Beard send notifications to pyTivo?<br /><br /></span>
+                                <span class="component-desc">Should Sick Beard update commands to pyTivo?<br /><br /></span>
                             </label>
                             <label class="nocheck clearfix" for="use_pytivo">
                                 <span class="component-title">&nbsp;</span>
@@ -417,7 +449,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">pyTivo Share name</span>
+                                    <span class="component-title">pyTivo Share Name</span>
                                     <input type="text" name="pytivo_share_name" id="pytivo_share_name" value="$sickbeard.PYTIVO_SHARE_NAME" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
@@ -455,6 +487,7 @@
                         <img class="notifier-icon" src="$sbRoot/images/notifiers/growl.png" alt="" title="Growl" />
                         <h3><a href="http://growl.info/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Growl</a></h3>
                         <p>A cross-platform unobtrusive global notification system.</p>
+                        <p>For more information visit our <a href="https://github.com/midgetspy/Sick-Beard/wiki/Notifiers:-Growl" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Wiki</a>.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
@@ -545,7 +578,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Prowl API key:</span>
+                                    <span class="component-title">Prowl API Key:</span>
                                     <input type="text" name="prowl_api" id="prowl_api" value="$sickbeard.PROWL_API" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
@@ -628,7 +661,7 @@
                             <input type="checkbox" class="enabler" name="use_pushover" id="use_pushover" #if $sickbeard.USE_PUSHOVER then "checked=\"checked\"" else ""# />
                             <label class="clearfix" for="use_pushover">
                                 <span class="component-title">Enable</span>
-                                <span class="component-desc">Should Sick Beard send notifications through Pushover?</span>
+                                <span class="component-desc">Should Sick Beard send Pushover notifications?</span>
                             </label>
                         </div>
 
@@ -669,14 +702,14 @@
                     <div class="component-group-desc">
                         <img class="notifier-icon" src="$sbRoot/images/notifiers/boxcar.png" alt="" title="Boxcar" />
                         <h3><a href="http://boxcar.io/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Boxcar</a></h3>
-                        <p>Read your messages where and when you want them! A subscription will be send if needed.</p>
+                        <p>Universal push notification for iOS. Read your messages where and when you want them! A subscription will be sent if needed.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
                             <input type="checkbox" class="enabler" name="use_boxcar" id="use_boxcar" #if $sickbeard.USE_BOXCAR then "checked=\"checked\"" else ""# />
                             <label class="clearfix" for="use_boxcar">
                                 <span class="component-title">Enable</span>
-                                <span class="component-desc">Should Sick Beard send notifications through Boxcar?</span>
+                                <span class="component-desc">Should Sick Beard send Boxcar notifications?</span>
                             </label>
                         </div>
 
@@ -746,7 +779,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                       <span class="component-title">NMA API key:</span>
+                                       <span class="component-title">NMA API Key:</span>
                                     <input type="text" name="nma_api" id="nma_api" value="$sickbeard.NMA_API" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
@@ -783,7 +816,7 @@
                 </div><br />
 
                 <br />
-                <h2>Online</h2>
+                <h2>Social</h2>
                 <br />
 
 
@@ -892,7 +925,7 @@
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Trakt API key:</span>
+                                    <span class="component-title">Trakt API Key:</span>
                                     <input type="text" name="trakt_api" id="trakt_api" value="$sickbeard.TRAKT_API" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
diff --git a/data/interfaces/default/config_postProcessing.tmpl b/data/interfaces/default/config_postProcessing.tmpl
index 910a35c723..8e27d923ed 100644
--- a/data/interfaces/default/config_postProcessing.tmpl
+++ b/data/interfaces/default/config_postProcessing.tmpl
@@ -21,7 +21,7 @@
 <div id="config-content">
 <h5>All non-absolute folder locations are relative to <span class="path">$sickbeard.DATA_DIR</span></h5>
 
-<form id="configForms" action="savePostProcessing" method="post">
+<form id="configForm" action="savePostProcessing" method="post">
 
             <div id="config-components">
 
diff --git a/data/interfaces/default/displayShow.tmpl b/data/interfaces/default/displayShow.tmpl
index 2f4e915995..7a21dc6dd4 100644
--- a/data/interfaces/default/displayShow.tmpl
+++ b/data/interfaces/default/displayShow.tmpl
@@ -130,7 +130,7 @@ Change selected episodes to
 #for $epResult in $sqlResults:
 
     #if int($epResult["season"]) != $curSeason:
-  <tr><td colspan="9"><a name="season-$epResult["season"]"></a></td></tr>
+  <tr class="seasonheader"><td colspan="9"><a name="season-$epResult["season"]"></a></td></tr>
   <tr class="seasonheader" id="season-$epResult["season"]">
     <td colspan="9">
         <h2>#if int($epResult["season"]) == 0 then "Specials" else "Season "+str($epResult["season"])#</h2>
@@ -138,7 +138,7 @@ Change selected episodes to
   </tr>
   <tr id="season-$epResult["season"]-cols"><th width="1%"><input type="checkbox" class="seasonCheck" id="$epResult["season"]" /></th><th>NFO</th><th>TBN</th><th>Episode</th><th>Name</th><th class="nowrap">Airdate</th><th>Filename</th><th>Status</th><th>Search</th></tr>
         #set $curSeason = int($epResult["season"])
-    #end if    
+    #end if
 
   #set $epStr = str($epResult["season"]) + "x" + str($epResult["episode"])
   #set $epLoc = $epResult["location"]
diff --git a/data/interfaces/default/editShow.tmpl b/data/interfaces/default/editShow.tmpl
index 7676d0bce4..a504c7891f 100644
--- a/data/interfaces/default/editShow.tmpl
+++ b/data/interfaces/default/editShow.tmpl
@@ -51,39 +51,42 @@
 
 <form action="editShow" method="post">
 <input type="hidden" name="show" value="$show.tvdbid" />
-Location: <input type="text" name="location" id="location" value="$show._location" size="50" /><br />
+<span class="showLegend">Location:</span><input type="text" name="location" id="location" value="$show._location" size="50" /><br />
 <br />
-Quality:
+<span class="showLegend">Quality:</span>
 #set $qualities = $common.Quality.splitQuality(int($show.quality))
 #set global $anyQualities = $qualities[0]
 #set global $bestQualities = $qualities[1]
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_qualityChooser.tmpl")
 <br />
-<br />
-Language: <select name="tvdbLang" id="tvdbLangSelect"></select><br />
+<span class="showLegend">Language:</span><select name="tvdbLang" id="tvdbLangSelect"></select><br />
 Note: This will only affect the language of the retrieved metadata file contents and episode filenames.<br />
 This <b>DOES NOT</b> allow Sick Beard to download non-english TV episodes!<br />
 <br />
+
+<span class="showLegend">Flatten files (no folders):</span><input type="checkbox" name="flatten_folders" #if $show.flatten_folders == 1 and not $sickbeard.NAMING_FORCE_FOLDERS then "checked=\"checked\"" else ""# #if $sickbeard.NAMING_FORCE_FOLDERS then "disabled=\"disabled\"" else ""#/><br />
+<br />
+
+<span class="showLegend">Paused:</span><input type="checkbox" name="paused" #if $show.paused == 1 then "checked=\"checked\"" else ""# /><br />
 <br />
-Flatten files (no folders): <input type="checkbox" name="flatten_folders" #if $show.flatten_folders == 1 and not $sickbeard.NAMING_FORCE_FOLDERS then "checked=\"checked\"" else ""# #if $sickbeard.NAMING_FORCE_FOLDERS then "disabled=\"disabled\"" else ""#/><br /><br />
-Paused: <input type="checkbox" name="paused" #if $show.paused == 1 then "checked=\"checked\"" else ""# /><br /><br />
 
-Air by date: 
-<input type="checkbox" name="air_by_date" #if $show.air_by_date == 1 then "checked=\"checked\"" else ""# /><br />
-(check this if the show is released as Show.03.02.2010 rather than Show.S02E03) 
-<br /><br />
+<span class="showLegend">Air by date:</span><input type="checkbox" name="air_by_date" #if $show.air_by_date == 1 then "checked=\"checked\"" else ""# /><br />
+(check this if the show is released as Show.03.02.2010 rather than Show.S02E03)<br />
+<br />
 
-Ignored Words (all shows): $sickbeard.IGNORE_WORDS<br /><br />
+<span class="showLegend">Ignored Words (all shows):</span>$sickbeard.IGNORE_WORDS<br />
+<br />
 
-Separate words with a comma, e.g. "word1,word2,word3"<br/><br/>
+<span class="showLegend">Ignored Words (this show):</span><input type="text" name="rls_ignore_words" id="rls_ignore_words" value="$show.rls_ignore_words" size="50" /><br />
+Results <b>with any</b> of these words in the title will be filtered out<br />
+Separate words with a comma, e.g. "word1,word2,word3"<br />
+<br />
 
-Ignored Words (this show): <input type="text" name="rls_ignore_words" id="rls_ignore_words" value="$show.rls_ignore_words" size="50" /><br />
-Results with any of these words in the title will be filtered out
-<br /><br />
+<span class="showLegend">Required Words (this show):</span><input type="text" name="rls_require_words" id="rls_require_words" value="$show.rls_require_words" size="50" /><br />
+Results <b>without one</b> of these words in the title will be filtered out<br />
+Separate words with a comma, e.g. "word1,word2,word3"<br />
+<br />
 
-Required Words (this show): <input type="text" name="rls_require_words" id="rls_require_words" value="$show.rls_require_words" size="50" /><br />
-Results without one of these words in the title will be filtered out 
-<br /><br />
 <input class="btn" type="submit" value="Submit" />
 </form>
 
diff --git a/data/interfaces/default/inc_top.tmpl b/data/interfaces/default/inc_top.tmpl
index 892f1d074a..6820ed889a 100644
--- a/data/interfaces/default/inc_top.tmpl
+++ b/data/interfaces/default/inc_top.tmpl
@@ -69,11 +69,11 @@
     <script type="text/javascript" src="$sbRoot/js/lib/jquery-ui-1.10.4.custom.min.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js?$sbPID"></script>
-    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.14.min.js?$sbPID"></script>
-    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.14.min.js?$sbPID"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter-2.16.3.min.js?$sbPID"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.widgets-2.16.3.min.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.qtip-2012-04-26.min.js?$sbPID"></script>
     <script type="text/javascript" src="$sbRoot/js/lib/jquery.pnotify-1.2.2.min.js?$sbPID"></script>
-    <script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.35.js?$sbPID"></script>
+    <script type="text/javascript" src="$sbRoot/js/lib/jquery.form-3.50.js?$sbPID"></script>
 
     <script type="text/javascript" charset="utf-8">
     <!--
diff --git a/data/js/addExistingShow.js b/data/js/addExistingShow.js
index 5d898a4382..d5cb182662 100644
--- a/data/js/addExistingShow.js
+++ b/data/js/addExistingShow.js
@@ -1,15 +1,15 @@
 $(document).ready(function() { 
 
-    $('#checkAll').live('click', function(){
+    $('#tableDiv').on('click', '#checkAll', function() {
 
         var seasCheck = this;
 
-        $('.dirCheck').each(function(){
+        $('.dirCheck').each(function() {
             this.checked = seasCheck.checked;
         });
     });
 
-    $('#submitShowDirs').click(function(){
+    $('#submitShowDirs').click(function() {
 
         var dirArr = new Array();
 
@@ -35,7 +35,7 @@ $(document).ready(function() {
 
     function loadContent() {
         var url = '';
-        $('.dir_check').each(function(i,w){
+        $('.dir_check').each(function(i,w) {
             if ($(w).is(':checked')) {
                 if (url.length) {
                     url += '&';
@@ -72,10 +72,12 @@ $(document).ready(function() {
         loadContent();
     });
 
-    $('.dir_check').live('click', loadContent);
+    $('#rootDirStaticList').on('click', '.dir_check', loadContent);
 
-    $('.showManage').live('click', function() {
-        $("#tabs").tabs( 'select', 0);
+    $('#tableDiv').on('click', '.showManage', function(event) {
+        event.preventDefault();
+        $("#tabs").tabs('option', 'active', 0);
+        $('html,body').animate({scrollTop:0}, 1000);
     });
 
 });
diff --git a/data/js/browser.js b/data/js/browser.js
index feb53e8d83..fea5128556 100644
--- a/data/js/browser.js
+++ b/data/js/browser.js
@@ -34,6 +34,8 @@
                 return i++ != 0;
             });
             $('<h2>').text(first_val.current_path).appendTo(fileBrowserDialog);
+            // set current path to what we path we actually did load (in case the previous dir is no longer there)
+            currentBrowserPath = first_val.current_path;
             list = $('<ul>').appendTo(fileBrowserDialog);
             $.each(data, function (i, entry) {
                 link = $("<a href='javascript:void(0)' />").click(function () { browse(entry.path, endpoint); }).text(entry.name);
@@ -93,6 +95,10 @@
         if (options.initialDir) {
             initialDir = options.initialDir;
         }
+        // HACK to allow users to specify \\server\path to override use of stored values
+        if (options.field && options.field.val().indexOf('\\') == 0) {
+            initialDir = options.field.val()
+        }
         browse(initialDir, options.url);
         fileBrowserDialog.dialog('open');
 
diff --git a/data/js/configNotifications.js b/data/js/configNotifications.js
index c11ed49729..c23d689c3f 100644
--- a/data/js/configNotifications.js
+++ b/data/js/configNotifications.js
@@ -1,133 +1,187 @@
 $(document).ready(function () {
     var loading = '<img src="' + sbRoot + '/images/loading16.gif" height="16" width="16" />';
 
-    $('#testGrowl').click(function () {
-        $('#testGrowl-result').html(loading);
-        var growl_host = $("#growl_host").val();
-        var growl_password = $("#growl_password").val();
-        $.get(sbRoot + "/home/testGrowl", {'host': growl_host, 'password': growl_password},
-            function (data) { $('#testGrowl-result').html(data); });
+    $("#testGrowl").click(function () {
+        var growl_host = $.trim($("#growl_host").val());
+        var growl_password = $.trim($("#growl_password").val());
+        if (!growl_host) {
+            $("#testGrowl-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testGrowl-result").html(loading);
+        $.get(sbRoot + "/home/testGrowl", {'host': growl_host, 'password': growl_password})
+            .done(function (data) {
+                $("#testGrowl-result").html(data);
+                $("#testGrowl").attr("disabled", false);
+            });
     });
 
-    $('#testProwl').click(function () {
-        $('#testProwl-result').html(loading);
-        var prowl_api = $("#prowl_api").val();
+    $("#testProwl").click(function () {
+        var prowl_api = $.trim($("#prowl_api").val());
         var prowl_priority = $("#prowl_priority").val();
-        $.get(sbRoot + "/home/testProwl", {'prowl_api': prowl_api, 'prowl_priority': prowl_priority},
-            function (data) { $('#testProwl-result').html(data); });
+        if (!prowl_api) {
+            $("#testProwl-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testProwl-result").html(loading);
+        $.get(sbRoot + "/home/testProwl", {'prowl_api': prowl_api, 'prowl_priority': prowl_priority})
+            .done(function (data) {
+                $("#testProwl-result").html(data);
+                $("#testProwl").attr("disabled", false);
+            });
     });
 
-    $('#testXBMC').click(function () {
-        $("#testXBMC").attr("disabled", true);
-        $('#testXBMC-result').html(loading);
-        var xbmc_host = $("#xbmc_host").val();
-        var xbmc_username = $("#xbmc_username").val();
-        var xbmc_password = $("#xbmc_password").val();
+    $("#testXBMC").click(function () {
+        var xbmc_host = $.trim($("#xbmc_host").val());
+        var xbmc_username = $.trim($("#xbmc_username").val());
+        var xbmc_password = $.trim($("#xbmc_password").val());
+        if (!xbmc_host) {
+            $("#testXBMC-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testXBMC-result").html(loading);
         $.get(sbRoot + "/home/testXBMC", {'host': xbmc_host, 'username': xbmc_username, 'password': xbmc_password})
             .done(function (data) {
-                $('#testXBMC-result').html(data);
+                $("#testXBMC-result").html(data);
                 $("#testXBMC").attr("disabled", false);
             });
     });
 
-    $('#testPLEX').click(function () {
-        $('#testPLEX-result').html(loading);
-        var plex_host = $("#plex_host").val();
-        var plex_username = $("#plex_username").val();
-        var plex_password = $("#plex_password").val();
-        $.get(sbRoot + "/home/testPLEX", {'host': plex_host, 'username': plex_username, 'password': plex_password},
-            function (data) { $('#testPLEX-result').html(data); });
+    $("#testPLEX").click(function () {
+        var plex_host = $.trim($("#plex_host").val());
+        var plex_username = $.trim($("#plex_username").val());
+        var plex_password = $.trim($("#plex_password").val());
+        if (!plex_host) {
+            $("#testPLEX-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testPLEX-result").html(loading);
+        $.get(sbRoot + "/home/testPLEX", {'host': plex_host, 'username': plex_username, 'password': plex_password})
+            .done(function (data) {
+                $("#testPLEX-result").html(data);
+                $("#testPLEX").attr("disabled", false);
+            });
     });
 
-    $('#testBoxcar').click(function () {
-        $('#testBoxcar-result').html(loading);
-        var boxcar_username = $("#boxcar_username").val();
-        $.get(sbRoot + "/home/testBoxcar", {'username': boxcar_username},
-            function (data) { $('#testBoxcar-result').html(data); });
+    $("#testBoxcar").click(function () {
+        var boxcar_username = $.trim($("#boxcar_username").val());
+        if (!boxcar_username) {
+            $("#testBoxcar-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testBoxcar-result").html(loading);
+        $.get(sbRoot + "/home/testBoxcar", {'username': boxcar_username})
+            .done(function (data) {
+                $("#testBoxcar-result").html(data);
+                $("#testBoxcar").attr("disabled", false);
+            });
     });
 
-    $('#testPushover').click(function () {
-        $('#testPushover-result').html(loading);
-        var pushover_userkey = $("#pushover_userkey").val();
-        $.get(sbRoot + "/home/testPushover", {'userKey': pushover_userkey},
-            function (data) { $('#testPushover-result').html(data); });
+    $("#testPushover").click(function () {
+        var pushover_userkey = $.trim($("#pushover_userkey").val());
+        if (!pushover_userkey) {
+            $("#testPushover-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testPushover-result").html(loading);
+        $.get(sbRoot + "/home/testPushover", {'userKey': pushover_userkey})
+            .done(function (data) {
+                $("#testPushover-result").html(data);
+                $("#testPushover").attr("disabled", false);
+            });
     });
 
-    $('#testLibnotify').click(function () {
-        $('#testLibnotify-result').html(loading);
+    $("#testLibnotify").click(function () {
+        $("#testLibnotify-result").html(loading);
         $.get(sbRoot + "/home/testLibnotify",
-            function (data) { $('#testLibnotify-result').html(data); });
+            function (data) { $("#testLibnotify-result").html(data); });
     });
 
-    $('#twitterStep1').click(function () {
-        $('#testTwitter-result').html(loading);
+    $("#twitterStep1").click(function () {
+        $("#testTwitter-result").html(loading);
         $.get(sbRoot + "/home/twitterStep1", function (data) {window.open(data); })
-            .done(function () { $('#testTwitter-result').html('<b>Step1:</b> Confirm Authorization'); });
+            .done(function () { $("#testTwitter-result").html("<b>Step1:</b> Confirm Authorization"); });
     });
 
-    $('#twitterStep2').click(function () {
-        $('#testTwitter-result').html(loading);
-        var twitter_key = $("#twitter_key").val();
+    $("#twitterStep2").click(function () {
+        var twitter_key = $.trim($("#twitter_key").val());
+        if (!twitter_key) {
+            $("#testTwitter-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $("#testTwitter-result").html(loading);
         $.get(sbRoot + "/home/twitterStep2", {'key': twitter_key},
-            function (data) { $('#testTwitter-result').html(data); });
+            function (data) { $("#testTwitter-result").html(data); });
     });
 
-    $('#testTwitter').click(function () {
+    $("#testTwitter").click(function () {
         $.get(sbRoot + "/home/testTwitter",
-            function (data) { $('#testTwitter-result').html(data); });
+            function (data) { $("#testTwitter-result").html(data); });
     });
 
-    $('#settingsNMJ').click(function () {
-        if (!$('#nmj_host').val()) {
-            alert('Please fill in the Popcorn IP address');
-            $('#nmj_host').focus();
+    $("#settingsNMJ").click(function () {
+        var nmj_host = $.trim($("#nmj_host").val());
+        if (!nmj_host) {
+            alert("Please fill in the Popcorn IP address");
+            $("#nmj_host").focus();
             return;
         }
-        $('#testNMJ-result').html(loading);
-        var nmj_host = $('#nmj_host').val();
-
+        $("#testNMJ-result").html(loading);
         $.get(sbRoot + "/home/settingsNMJ", {'host': nmj_host},
             function (data) {
                 if (data === null) {
-                    $('#nmj_database').removeAttr('readonly');
-                    $('#nmj_mount').removeAttr('readonly');
+                    $("#nmj_database").removeAttr("readonly");
+                    $("#nmj_mount").removeAttr("readonly");
                 }
                 var JSONData = $.parseJSON(data);
-                $('#testNMJ-result').html(JSONData.message);
-                $('#nmj_database').val(JSONData.database);
-                $('#nmj_mount').val(JSONData.mount);
+                $("#testNMJ-result").html(JSONData.message);
+                $("#nmj_database").val(JSONData.database);
+                $("#nmj_mount").val(JSONData.mount);
 
                 if (JSONData.database) {
-                    $('#nmj_database').attr('readonly', true);
+                    $("#nmj_database").attr("readonly", true);
                 } else {
-                    $('#nmj_database').removeAttr('readonly');
+                    $("#nmj_database").removeAttr("readonly");
                 }
                 if (JSONData.mount) {
-                    $('#nmj_mount').attr('readonly', true);
+                    $("#nmj_mount").attr("readonly", true);
                 } else {
-                    $('#nmj_mount').removeAttr('readonly');
+                    $("#nmj_mount").removeAttr("readonly");
                 }
             });
     });
 
-    $('#testNMJ').click(function () {
-        $('#testNMJ-result').html(loading);
-        var nmj_host = $("#nmj_host").val();
+    $("#testNMJ").click(function () {
+        var nmj_host = $.trim($("#nmj_host").val());
         var nmj_database = $("#nmj_database").val();
         var nmj_mount = $("#nmj_mount").val();
-
-        $.get(sbRoot + "/home/testNMJ", {'host': nmj_host, 'database': nmj_database, 'mount': nmj_mount},
-            function (data) { $('#testNMJ-result').html(data); });
+        if (!nmj_host) {
+            $("#testNMJ-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testNMJ-result").html(loading);
+        $.get(sbRoot + "/home/testNMJ", {'host': nmj_host, 'database': nmj_database, 'mount': nmj_mount})
+            .done(function (data) {
+                $("#testNMJ-result").html(data);
+                $("#testNMJ").attr("disabled", false);
+            });
     });
 
-    $('#settingsNMJv2').click(function () {
-        if (!$('#nmjv2_host').val()) {
-            alert('Please fill in the Popcorn IP address');
-            $('#nmjv2_host').focus();
+    $("#settingsNMJv2").click(function () {
+        var nmjv2_host = $.trim($("#nmjv2_host").val());
+        if (!nmjv2_host) {
+            alert("Please fill in the Popcorn IP address");
+            $("#nmjv2_host").focus();
             return;
         }
-        $('#testNMJv2-result').html(loading);
-        var nmjv2_host = $('#nmjv2_host').val();
+
         var nmjv2_dbloc;
         var radios = document.getElementsByName("nmjv2_dbloc");
         for (var i = 0; i < radios.length; i++) {
@@ -137,47 +191,81 @@ $(document).ready(function () {
             }
         }
 
-        var nmjv2_dbinstance=$('#NMJv2db_instance').val();
+        var nmjv2_dbinstance = $("#NMJv2db_instance").val();
+        $("#testNMJv2-result").html(loading);
         $.get(sbRoot + "/home/settingsNMJv2", {'host': nmjv2_host, 'dbloc': nmjv2_dbloc, 'instance': nmjv2_dbinstance},
-        function (data){
+        function (data) {
             if (data == null) {
-                $('#nmjv2_database').removeAttr('readonly');
+                $("#nmjv2_database").removeAttr("readonly");
             }
-            var JSONData = $.parseJSON(data);
-            $('#testNMJv2-result').html(JSONData.message);
-            $('#nmjv2_database').val(JSONData.database);
-            
+            var JSONData = $.parseJSON(data || "null");
+            $("#testNMJv2-result").html(JSONData.message);
+            $("#nmjv2_database").val(JSONData.database);
+
             if (JSONData.database) {
-                $('#nmjv2_database').attr('readonly', true);
+                $("#nmjv2_database").attr("readonly", true);
             } else {
-                $('#nmjv2_database').removeAttr('readonly');
+                $("#nmjv2_database").removeAttr("readonly");
             }
         });
     });
 
-    $('#testNMJv2').click(function () {
-        $('#testNMJv2-result').html(loading);
-        var nmjv2_host = $("#nmjv2_host").val();
-        
-        $.get(sbRoot + "/home/testNMJv2", {'host': nmjv2_host},
-            function (data){ $('#testNMJv2-result').html(data); });
+    $("#testNMJv2").click(function () {
+        var nmjv2_host = $.trim($("#nmjv2_host").val());
+        if (!nmjv2_host) {
+            $("#testNMJv2-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testNMJv2-result").html(loading);
+        $.get(sbRoot + "/home/testNMJv2", {'host': nmjv2_host})
+            .done(function (data) {
+                $("#testNMJv2-result").html(data);
+                $("#testNMJv2").attr("disabled", false);
+            });
     });
 
-    $('#testTrakt').click(function () {
-        $('#testTrakt-result').html(loading);
-        var trakt_api = $("#trakt_api").val();
-        var trakt_username = $("#trakt_username").val();
-        var trakt_password = $("#trakt_password").val();
-
-        $.get(sbRoot + "/home/testTrakt", {'api': trakt_api, 'username': trakt_username, 'password': trakt_password},
-            function (data) { $('#testTrakt-result').html(data); });
+    $("#testTrakt").click(function () {
+        var trakt_api = $.trim($("#trakt_api").val());
+        var trakt_username = $.trim($("#trakt_username").val());
+        var trakt_password = $.trim($("#trakt_password").val());
+        if (!trakt_api || !trakt_username || !trakt_password) {
+            $("#testTrakt-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testTrakt-result").html(loading);
+        $.get(sbRoot + "/home/testTrakt", {'api': trakt_api, 'username': trakt_username, 'password': trakt_password})
+            .done(function (data) {
+                $("#testTrakt-result").html(data);
+                $("#testTrakt").attr("disabled", false);
+            });
     });
 
-    $('#testNMA').click(function () {
-        $('#testNMA-result').html(loading);
-        var nma_api = $("#nma_api").val();
+    $("#testNMA").click(function () {
+        var nma_api = $.trim($("#nma_api").val());
         var nma_priority = $("#nma_priority").val();
-        $.get(sbRoot + "/home/testNMA", {'nma_api': nma_api, 'nma_priority': nma_priority},
-            function (data) { $('#testNMA-result').html(data); });
+        if (!nma_api) {
+            $("#testNMA-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).attr("disabled", true);
+        $("#testNMA-result").html(loading);
+        $.get(sbRoot + "/home/testNMA", {'nma_api': nma_api, 'nma_priority': nma_priority})
+            .done(function (data) {
+                $("#testNMA-result").html(data);
+                $("#testNMA").attr("disabled", false);
+            });
+    });
+
+    $("#testSynoNotify").click(function () {
+        $(this).attr("disabled", true);
+        $("#testSynoNotify-result").html(loading);
+        $.get(sbRoot + "/home/testSynoNotify")
+            .done(function (data) {
+                $("#testSynoNotify-result").html(data);
+                $("#testSynoNotify").attr("disabled", false);
+            });
     });
+
 });
diff --git a/data/js/configProviders.js b/data/js/configProviders.js
index 1c0d70df30..7bdbe8385b 100644
--- a/data/js/configProviders.js
+++ b/data/js/configProviders.js
@@ -92,18 +92,18 @@ $(document).ready(function(){
         $('#newznab_key').val(data[2]);
 
         if (selectedProvider == 'addNewznab') {
-            $('#newznab_name').removeAttr("disabled");
-            $('#newznab_url').removeAttr("disabled");
+            $('#newznab_name').prop("disabled", false);
+            $('#newznab_url').prop("disabled", false);
         } else {
 
-            $('#newznab_name').attr("disabled", "disabled");
+            $('#newznab_name').prop("disabled", true);
 
             if (isDefault) {
-                $('#newznab_url').attr("disabled", "disabled");
-                $('#newznab_delete').attr("disabled", "disabled");
+                $('#newznab_url').prop("disabled", true);
+                $('#newznab_delete').prop("disabled", true);
             } else {
-                $('#newznab_url').removeAttr("disabled");
-                $('#newznab_delete').removeAttr("disabled");
+                $('#newznab_url').prop("disabled", false);
+                $('#newznab_delete').prop("disabled", false);
             }
         }
 
@@ -161,15 +161,15 @@ $(document).ready(function(){
 
     });
 
-    $('#editAProvider').change(function(){
+    $('#editAProvider').change(function() {
         $(this).showHideProviders();
     });
 
-    $('#editANewznabProvider').change(function(){
+    $('#editANewznabProvider').change(function() {
         $(this).populateNewznabSection();
     });
 
-    $('.provider_enabler').live('click', function(){
+    $('#providerOrderList').on('click', '.provider_enabler', function() {
         $(this).refreshProviderList();
     });
 
diff --git a/data/js/displayShow.js b/data/js/displayShow.js
index 2fb6afc8ea..53a0a44ce2 100644
--- a/data/js/displayShow.js
+++ b/data/js/displayShow.js
@@ -14,9 +14,9 @@ $(document).ready(function(){
     $("#prevShow").click(function() {
         var show = $('#pickShow option:selected');
         if (show.prev('option').length < 1){
-            show.parent().children('option:last').attr('selected', 'selected');
+            show.parent().children('option:last').prop('selected', true);
         } else{
-            show.prev('option').attr('selected', 'selected');
+            show.prev('option').prop('selected', true);
         }
         $("#pickShow").change();
     });
@@ -24,9 +24,9 @@ $(document).ready(function(){
     $("#nextShow").click(function() {
         var show = $('#pickShow option:selected');
         if (show.next('option').length < 1) {
-            show.parent().children('option:first').attr('selected', 'selected');
+            show.parent().children('option:first').prop('selected', true);
         } else{
-            show.next('option').attr('selected', 'selected');
+            show.next('option').prop('selected', true);
         }
         $("#pickShow").change();
     });
@@ -113,7 +113,7 @@ $(document).ready(function(){
     // handle the show selection dropbox
     $('#pickShow').change(function() {
         var sbRoot = $('#sbRoot').val();
-        var val = $(this).attr('value');
+        var val = $(this).val();
         if (val == 0) {
             return;
         }
diff --git a/data/js/lib/jquery.form-3.35.js b/data/js/lib/jquery.form-3.50.js
similarity index 90%
rename from data/js/lib/jquery.form-3.35.js
rename to data/js/lib/jquery.form-3.50.js
index e3126cafdc..9606f91f03 100644
--- a/data/js/lib/jquery.form-3.35.js
+++ b/data/js/lib/jquery.form-3.50.js
@@ -1,7 +1,7 @@
 /*!
  * jQuery Form Plugin
- * version: 3.35.0-2013.05.23
- * @requires jQuery v1.5 or later
+ * version: 3.50.0-2014.02.05
+ * Requires jQuery v1.5 or later
  * Copyright (c) 2013 M. Alsup
  * Examples and documentation at: http://malsup.com/jquery/form/
  * Project repository: https://github.com/malsup/form
@@ -9,7 +9,20 @@
  * https://github.com/malsup/form#copyright-and-license
  */
 /*global ActiveXObject */
-;(function($) {
+
+// AMD support
+(function (factory) {
+    "use strict";
+    if (typeof define === 'function' && define.amd) {
+        // using AMD; register as anon module
+        define(['jquery'], factory);
+    } else {
+        // no AMD; invoke directly
+        factory( (typeof(jQuery) != 'undefined') ? jQuery : window.Zepto );
+    }
+}
+
+(function($) {
 "use strict";
 
 /*
@@ -63,11 +76,13 @@ var hasProp = !!$.fn.prop;
 // contains inputs with names like "action" or "method"; in those
 // cases "prop" returns the element
 $.fn.attr2 = function() {
-    if ( ! hasProp )
+    if ( ! hasProp ) {
         return this.attr.apply(this, arguments);
+    }
     var val = this.prop.apply(this, arguments);
-    if ( ( val && val.jquery ) || typeof val === 'string' )
+    if ( ( val && val.jquery ) || typeof val === 'string' ) {
         return val;
+    }
     return this.attr.apply(this, arguments);
 };
 
@@ -89,6 +104,9 @@ $.fn.ajaxSubmit = function(options) {
     if (typeof options == 'function') {
         options = { success: options };
     }
+    else if ( options === undefined ) {
+        options = {};
+    }
 
     method = options.type || this.attr2('method');
     action = options.url  || this.attr2('action');
@@ -103,7 +121,7 @@ $.fn.ajaxSubmit = function(options) {
     options = $.extend(true, {
         url:  url,
         success: $.ajaxSettings.success,
-        type: method || 'GET',
+        type: method || $.ajaxSettings.type,
         iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
     }, options);
 
@@ -206,7 +224,7 @@ $.fn.ajaxSubmit = function(options) {
 
     // [value] (issue #113), also see comment:
     // https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219
-    var fileInputs = $('input[type=file]:enabled[value!=""]', this);
+    var fileInputs = $('input[type=file]:enabled', this).filter(function() { return $(this).val() !== ''; });
 
     var hasFileInputs = fileInputs.length > 0;
     var mp = 'multipart/form-data';
@@ -242,8 +260,9 @@ $.fn.ajaxSubmit = function(options) {
     $form.removeData('jqxhr').data('jqxhr', jqxhr);
 
     // clear element array
-    for (var k=0; k < elements.length; k++)
+    for (var k=0; k < elements.length; k++) {
         elements[k] = null;
+    }
 
     // fire 'notify' event
     this.trigger('form-submit-notify', [this, options]);
@@ -275,9 +294,11 @@ $.fn.ajaxSubmit = function(options) {
 
         if (options.extraData) {
             var serializedData = deepSerialize(options.extraData);
-            for (i=0; i < serializedData.length; i++)
-                if (serializedData[i])
+            for (i=0; i < serializedData.length; i++) {
+                if (serializedData[i]) {
                     formdata.append(serializedData[i][0], serializedData[i][1]);
+                }
+            }
         }
 
         options.data = null;
@@ -292,7 +313,7 @@ $.fn.ajaxSubmit = function(options) {
         if (options.uploadProgress) {
             // workaround because jqXHR does not expose upload property
             s.xhr = function() {
-                var xhr = jQuery.ajaxSettings.xhr();
+                var xhr = $.ajaxSettings.xhr();
                 if (xhr.upload) {
                     xhr.upload.addEventListener('progress', function(event) {
                         var percent = 0;
@@ -309,11 +330,18 @@ $.fn.ajaxSubmit = function(options) {
         }
 
         s.data = null;
-            var beforeSend = s.beforeSend;
-            s.beforeSend = function(xhr, o) {
+        var beforeSend = s.beforeSend;
+        s.beforeSend = function(xhr, o) {
+            //Send FormData() provided by user
+            if (options.formData) {
+                o.data = options.formData;
+            }
+            else {
                 o.data = formdata;
-                if(beforeSend)
-                    beforeSend.call(this, xhr, o);
+            }
+            if(beforeSend) {
+                beforeSend.call(this, xhr, o);
+            }
         };
         return $.ajax(s);
     }
@@ -323,14 +351,21 @@ $.fn.ajaxSubmit = function(options) {
         var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
         var deferred = $.Deferred();
 
+        // #341
+        deferred.abort = function(status) {
+            xhr.abort(status);
+        };
+
         if (a) {
             // ensure that every serialized input is still enabled
             for (i=0; i < elements.length; i++) {
                 el = $(elements[i]);
-                if ( hasProp )
+                if ( hasProp ) {
                     el.prop('disabled', false);
-                else
+                }
+                else {
                     el.removeAttr('disabled');
+                }
             }
         }
 
@@ -340,10 +375,12 @@ $.fn.ajaxSubmit = function(options) {
         if (s.iframeTarget) {
             $io = $(s.iframeTarget);
             n = $io.attr2('name');
-            if (!n)
-                 $io.attr2('name', id);
-            else
+            if (!n) {
+                $io.attr2('name', id);
+            }
+            else {
                 id = n;
+            }
         }
         else {
             $io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
@@ -375,12 +412,15 @@ $.fn.ajaxSubmit = function(options) {
 
                 $io.attr('src', s.iframeSrc); // abort op in progress
                 xhr.error = e;
-                if (s.error)
+                if (s.error) {
                     s.error.call(s.context, xhr, e, status);
-                if (g)
+                }
+                if (g) {
                     $.event.trigger("ajaxError", [xhr, s, e]);
-                if (s.complete)
+                }
+                if (s.complete) {
                     s.complete.call(s.context, xhr, e);
+                }
             }
         };
 
@@ -467,11 +507,14 @@ $.fn.ajaxSubmit = function(options) {
         // take a breath so that pending repaints get some cpu time before the upload starts
         function doSubmit() {
             // make sure form attrs are set
-            var t = $form.attr2('target'), a = $form.attr2('action');
+            var t = $form.attr2('target'), 
+                a = $form.attr2('action'), 
+                mp = 'multipart/form-data',
+                et = $form.attr('enctype') || $form.attr('encoding') || mp;
 
             // update form attrs in IE friendly way
             form.setAttribute('target',id);
-            if (!method) {
+            if (!method || /post/i.test(method) ) {
                 form.setAttribute('method', 'POST');
             }
             if (a != s.url) {
@@ -496,14 +539,16 @@ $.fn.ajaxSubmit = function(options) {
                 try {
                     var state = getDoc(io).readyState;
                     log('state = ' + state);
-                    if (state && state.toLowerCase() == 'uninitialized')
+                    if (state && state.toLowerCase() == 'uninitialized') {
                         setTimeout(checkState,50);
+                    }
                 }
                 catch(e) {
                     log('Server abort: ' , e, ' (', e.name, ')');
                     cb(SERVER_ABORT);
-                    if (timeoutHandle)
+                    if (timeoutHandle) {
                         clearTimeout(timeoutHandle);
+                    }
                     timeoutHandle = undefined;
                 }
             }
@@ -531,10 +576,12 @@ $.fn.ajaxSubmit = function(options) {
                 if (!s.iframeTarget) {
                     // add iframe to doc and submit the form
                     $io.appendTo('body');
-                    if (io.attachEvent)
-                        io.attachEvent('onload', cb);
-                    else
-                        io.addEventListener('load', cb, false);
+                }
+                if (io.attachEvent) {
+                    io.attachEvent('onload', cb);
+                }
+                else {
+                    io.addEventListener('load', cb, false);
                 }
                 setTimeout(checkState,15);
 
@@ -549,6 +596,7 @@ $.fn.ajaxSubmit = function(options) {
             finally {
                 // reset attrs and remove "extra" input elements
                 form.setAttribute('action',a);
+                form.setAttribute('enctype', et); // #380
                 if(t) {
                     form.setAttribute('target', t);
                 } else {
@@ -590,13 +638,16 @@ $.fn.ajaxSubmit = function(options) {
 
             if (!doc || doc.location.href == s.iframeSrc) {
                 // response not received yet
-                if (!timedOut)
+                if (!timedOut) {
                     return;
+                }
             }
-            if (io.detachEvent)
+            if (io.detachEvent) {
                 io.detachEvent('onload', cb);
-            else
+            }
+            else {
                 io.removeEventListener('load', cb, false);
+            }
 
             var status = 'success', errMsg;
             try {
@@ -623,11 +674,12 @@ $.fn.ajaxSubmit = function(options) {
                 var docRoot = doc.body ? doc.body : doc.documentElement;
                 xhr.responseText = docRoot ? docRoot.innerHTML : null;
                 xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-                if (isXml)
+                if (isXml) {
                     s.dataType = 'xml';
+                }
                 xhr.getResponseHeader = function(header){
                     var headers = {'content-type': s.dataType};
-                    return headers[header];
+                    return headers[header.toLowerCase()];
                 };
                 // support for XHR 'status' & 'statusText' emulation :
                 if (docRoot) {
@@ -687,40 +739,52 @@ $.fn.ajaxSubmit = function(options) {
 
             // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
             if (status === 'success') {
-                if (s.success)
+                if (s.success) {
                     s.success.call(s.context, data, 'success', xhr);
+                }
                 deferred.resolve(xhr.responseText, 'success', xhr);
-                if (g)
+                if (g) {
                     $.event.trigger("ajaxSuccess", [xhr, s]);
+                }
             }
             else if (status) {
-                if (errMsg === undefined)
+                if (errMsg === undefined) {
                     errMsg = xhr.statusText;
-                if (s.error)
+                }
+                if (s.error) {
                     s.error.call(s.context, xhr, status, errMsg);
+                }
                 deferred.reject(xhr, 'error', errMsg);
-                if (g)
+                if (g) {
                     $.event.trigger("ajaxError", [xhr, s, errMsg]);
+                }
             }
 
-            if (g)
+            if (g) {
                 $.event.trigger("ajaxComplete", [xhr, s]);
+            }
 
             if (g && ! --$.active) {
                 $.event.trigger("ajaxStop");
             }
 
-            if (s.complete)
+            if (s.complete) {
                 s.complete.call(s.context, xhr, status);
+            }
 
             callbackProcessed = true;
-            if (s.timeout)
+            if (s.timeout) {
                 clearTimeout(timeoutHandle);
+            }
 
             // clean up
             setTimeout(function() {
-                if (!s.iframeTarget)
+                if (!s.iframeTarget) {
                     $io.remove();
+                }
+                else { //adding else to clean up existing iframe response.
+                    $io.attr('src', s.iframeSrc);
+                }
                 xhr.responseXML = null;
             }, 100);
         }
@@ -748,8 +812,9 @@ $.fn.ajaxSubmit = function(options) {
                 data = xml ? xhr.responseXML : xhr.responseText;
 
             if (xml && data.documentElement.nodeName === 'parsererror') {
-                if ($.error)
+                if ($.error) {
                     $.error('parsererror');
+                }
             }
             if (s && s.dataFilter) {
                 data = s.dataFilter(data, type);
@@ -822,7 +887,7 @@ function doAjaxSubmit(e) {
     var options = e.data;
     if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
         e.preventDefault();
-        $(this).ajaxSubmit(options);
+        $(e.target).ajaxSubmit(options); // #365
     }
 }
 
@@ -881,8 +946,23 @@ $.fn.formToArray = function(semantic, elements) {
     }
 
     var form = this[0];
+    var formId = this.attr('id');
     var els = semantic ? form.getElementsByTagName('*') : form.elements;
-    if (!els) {
+    var els2;
+
+    if (els && !/MSIE [678]/.test(navigator.userAgent)) { // #390
+        els = $(els).get();  // convert to standard array
+    }
+
+    // #386; account for inputs outside the form which use the 'form' attribute
+    if ( formId ) {
+        els2 = $(':input[form=' + formId + ']').get();
+        if ( els2.length ) {
+            els = (els || []).concat(els2);
+        }
+    }
+
+    if (!els || !els.length) {
         return a;
     }
 
@@ -905,15 +985,17 @@ $.fn.formToArray = function(semantic, elements) {
 
         v = $.fieldValue(el, true);
         if (v && v.constructor == Array) {
-            if (elements)
+            if (elements) {
                 elements.push(el);
+            }
             for(j=0, jmax=v.length; j < jmax; j++) {
                 a.push({name: n, value: v[j]});
             }
         }
         else if (feature.fileapi && el.type == 'file') {
-            if (elements)
+            if (elements) {
                 elements.push(el);
+            }
             var files = el.files;
             if (files.length) {
                 for (j=0; j < files.length; j++) {
@@ -926,8 +1008,9 @@ $.fn.formToArray = function(semantic, elements) {
             }
         }
         else if (v !== null && typeof v != 'undefined') {
-            if (elements)
+            if (elements) {
                 elements.push(el);
+            }
             a.push({name: n, value: v, type: el.type, required: el.required});
         }
     }
@@ -1023,10 +1106,12 @@ $.fn.fieldValue = function(successful) {
         if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
             continue;
         }
-        if (v.constructor == Array)
+        if (v.constructor == Array) {
             $.merge(val, v);
-        else
+        }
+        else {
             val.push(v);
+        }
     }
     return val;
 };
@@ -1060,7 +1145,7 @@ $.fieldValue = function(el, successful) {
             if (op.selected) {
                 var v = op.value;
                 if (!v) { // extra pain for IE...
-                    v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+                    v = (op.attributes && op.attributes.value && !(op.attributes.value.specified)) ? op.text : op.value;
                 }
                 if (one) {
                     return v;
@@ -1116,8 +1201,9 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
             //  $('#myForm').clearForm('.special:hidden')
             // the above would clean hidden inputs that have the class of 'special'
             if ( (includeHidden === true && /hidden/.test(t)) ||
-                 (typeof includeHidden == 'string' && $(this).is(includeHidden)) )
+                 (typeof includeHidden == 'string' && $(this).is(includeHidden)) ) {
                 this.value = '';
+            }
         }
     });
 };
@@ -1176,8 +1262,9 @@ $.fn.ajaxSubmit.debug = false;
 
 // helper fn for console logging
 function log() {
-    if (!$.fn.ajaxSubmit.debug)
+    if (!$.fn.ajaxSubmit.debug) {
         return;
+    }
     var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
     if (window.console && window.console.log) {
         window.console.log(msg);
@@ -1187,4 +1274,5 @@ function log() {
     }
 }
 
-})(jQuery);
+}));
+
diff --git a/data/js/lib/jquery.tablesorter-2.14.min.js b/data/js/lib/jquery.tablesorter-2.14.min.js
deleted file mode 100644
index d243454a1f..0000000000
--- a/data/js/lib/jquery.tablesorter-2.14.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
-* TableSorter 2.14.0 min - Client-side table sorting with ease!
-* Copyright (c) 2007 Christian Bach
-*/
-!function(g){g.extend({tablesorter:new function(){function c(){var a=1<arguments.length?Array.prototype.slice.call(arguments):arguments[0];"undefined"!==typeof console&&"undefined"!==typeof console.log?console.log(a):alert(a)}function q(a,b){c(a+" ("+((new Date).getTime()-b.getTime())+"ms)")}function k(a){for(var b in a)return!1;return!0}function p(a,b,d){if(!b)return"";var h=a.config,e=h.textExtraction,n="",n="simple"===e?h.supportsTextContent?b.textContent:g(b).text():"function"===typeof e?e(b, a,d):"object"===typeof e&&e.hasOwnProperty(d)?e[d](b,a,d):h.supportsTextContent?b.textContent:g(b).text();return g.trim(n)}function s(a){var b=a.config,d=b.$tbodies=b.$table.children("tbody:not(."+b.cssInfoBlock+")"),h,e,n,l,v,g,m,x="";if(0===d.length)return b.debug?c("*Empty table!* Not building a parser cache"):"";b.debug&&(m=new Date,c("Detecting parsers for each column"));d=d[0].rows;if(d[0])for(h=[],e=d[0].cells.length,n=0;n<e;n++){l=b.$headers.filter(":not([colspan])");l=l.add(b.$headers.filter('[colspan="1"]')).filter('[data-column="'+ n+'"]:last');v=b.headers[n];g=f.getParserById(f.getData(l,v,"sorter"));b.empties[n]=f.getData(l,v,"empty")||b.emptyTo||(b.emptyToBottom?"bottom":"top");b.strings[n]=f.getData(l,v,"string")||b.stringTo||"max";if(!g)a:{l=a;v=d;g=-1;for(var k=n,u=void 0,A=f.parsers.length,r=!1,s="",u=!0;""===s&&u;)g++,v[g]?(r=v[g].cells[k],s=p(l,r,k),l.config.debug&&c("Checking if value was empty on row "+g+", column: "+k+': "'+s+'"')):u=!1;for(;0<=--A;)if((u=f.parsers[A])&&"text"!==u.id&&u.is&&u.is(s,l,r)){g=u;break a}g= f.getParserById("text")}b.debug&&(x+="column:"+n+"; parser:"+g.id+"; string:"+b.strings[n]+"; empty: "+b.empties[n]+"\n");h.push(g)}b.debug&&(c(x),q("Completed detecting parsers",m));b.parsers=h}function w(a){var b=a.tBodies,d=a.config,h,e,n=d.parsers,l,v,y,m,x,k,u,A=[];d.cache={};if(!n)return d.debug?c("*Empty table!* Not building a cache"):"";d.debug&&(u=new Date);d.showProcessing&&f.isProcessing(a,!0);for(m=0;m<b.length;m++)if(d.cache[m]={row:[],normalized:[]},!g(b[m]).hasClass(d.cssInfoBlock)){h= b[m]&&b[m].rows.length||0;e=b[m].rows[0]&&b[m].rows[0].cells.length||0;for(v=0;v<h;++v)if(x=g(b[m].rows[v]),k=[],x.hasClass(d.cssChildRow))d.cache[m].row[d.cache[m].row.length-1]=d.cache[m].row[d.cache[m].row.length-1].add(x);else{d.cache[m].row.push(x);for(y=0;y<e;++y)l=p(a,x[0].cells[y],y),l=n[y].format(l,a,x[0].cells[y],y),k.push(l),"numeric"===(n[y].type||"").toLowerCase()&&(A[y]=Math.max(Math.abs(l)||0,A[y]||0));k.push(d.cache[m].normalized.length);d.cache[m].normalized.push(k)}d.cache[m].colMax= A}d.showProcessing&&f.isProcessing(a);d.debug&&q("Building cache for "+h+" rows",u)}function z(a,b){var d=a.config,h=d.widgetOptions,e=a.tBodies,n=[],l=d.cache,c,y,m,x,p,u,A,r,s,t,w;if(!k(l)){d.debug&&(w=new Date);for(r=0;r<e.length;r++)if(c=g(e[r]),c.length&&!c.hasClass(d.cssInfoBlock)){p=f.processTbody(a,c,!0);c=l[r].row;y=l[r].normalized;x=(m=y.length)?y[0].length-1:0;for(u=0;u<m;u++)if(t=y[u][x],n.push(c[t]),!d.appender||d.pager&&!(d.pager.removeRows&&h.pager_removeRows||d.pager.ajax))for(s=c[t].length, A=0;A<s;A++)p.append(c[t][A]);f.processTbody(a,p,!1)}d.appender&&d.appender(a,n);d.debug&&q("Rebuilt table",w);b||d.appender||f.applyWidget(a);g(a).trigger("sortEnd",a);g(a).trigger("updateComplete",a)}}function D(a){var b=[],d={},h=0,e=g(a).find("thead:eq(0), tfoot").children("tr"),n,l,c,f,m,k,q,p,t,r;for(n=0;n<e.length;n++)for(m=e[n].cells,l=0;l<m.length;l++){f=m[l];k=f.parentNode.rowIndex;q=k+"-"+f.cellIndex;p=f.rowSpan||1;t=f.colSpan||1;"undefined"===typeof b[k]&&(b[k]=[]);for(c=0;c<b[k].length+ 1;c++)if("undefined"===typeof b[k][c]){r=c;break}d[q]=r;h=Math.max(r,h);g(f).attr({"data-column":r});for(c=k;c<k+p;c++)for("undefined"===typeof b[c]&&(b[c]=[]),q=b[c],f=r;f<r+t;f++)q[f]="x"}a.config.columns=h+1;return d}function B(a){return/^d/i.test(a)||1===a}function E(a){var b=D(a),d,h,e,n,l,v,k,m=a.config;m.headerList=[];m.headerContent=[];m.debug&&(k=new Date);n=m.cssIcon?'<i class="'+(m.cssIcon===f.css.icon?f.css.icon:m.cssIcon+" "+f.css.icon)+'"></i>':"";m.$headers=g(a).find(m.selectorHeaders).each(function(a){h= g(this);d=m.headers[a];m.headerContent[a]=g(this).html();l=m.headerTemplate.replace(/\{content\}/g,g(this).html()).replace(/\{icon\}/g,n);m.onRenderTemplate&&(e=m.onRenderTemplate.apply(h,[a,l]))&&"string"===typeof e&&(l=e);g(this).html('<div class="tablesorter-header-inner">'+l+"</div>");m.onRenderHeader&&m.onRenderHeader.apply(h,[a]);this.column=b[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=B(f.getData(h,d,"sortInitialOrder")||m.sortInitialOrder)?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder= !1;v=f.getData(h,d,"lockedOrder")||!1;"undefined"!==typeof v&&!1!==v&&(this.order=this.lockedOrder=B(v)?[1,1,1]:[0,0,0]);h.addClass(f.css.header+" "+m.cssHeader);m.headerList[a]=this;h.parent().addClass(f.css.headerRow+" "+m.cssHeaderRow);m.tabIndex&&h.attr("tabindex",0)});I(a);m.debug&&(q("Built headers:",k),c(m.$headers))}function C(a,b,d){var h=a.config;h.$table.find(h.selectorRemove).remove();s(a);w(a);F(h.$table,b,d)}function I(a){var b,d=a.config;d.$headers.each(function(a,e){b="false"===f.getData(e, d.headers[a],"sorter");e.sortDisabled=b;g(e)[b?"addClass":"removeClass"]("sorter-false")})}function G(a){var b,d,h,e=a.config,n=e.sortList,c=[f.css.sortAsc+" "+e.cssAsc,f.css.sortDesc+" "+e.cssDesc],v=g(a).find("tfoot tr").children().removeClass(c.join(" "));e.$headers.removeClass(c.join(" "));h=n.length;for(b=0;b<h;b++)if(2!==n[b][1]&&(a=e.$headers.not(".sorter-false").filter('[data-column="'+n[b][0]+'"]'+(1===h?":last":"")),a.length))for(d=0;d<a.length;d++)a[d].sortDisabled||(a.eq(d).addClass(c[n[b][1]]), v.length&&v.filter('[data-column="'+n[b][0]+'"]').eq(d).addClass(c[n[b][1]]))}function L(a){if(a.config.widthFixed&&0===g(a).find("colgroup").length){var b=g("<colgroup>"),d=g(a).width();g(a.tBodies[0]).find("tr:first").children("td:visible").each(function(){b.append(g("<col>").css("width",parseInt(g(this).width()/d*1E3,10)/10+"%"))});g(a).prepend(b)}}function M(a,b){var d,h,e,n=a.config,c=b||n.sortList;n.sortList=[];g.each(c,function(a,b){d=[parseInt(b[0],10),parseInt(b[1],10)];if(e=n.$headers[d[0]])n.sortList.push(d), h=g.inArray(d[1],e.order),e.count=0<=h?h:d[1]%(n.sortReset?3:2)})}function N(a,b){return a&&a[b]?a[b].type||"":""}function O(a,b,d){var h,e,n,c=a.config,v=!d[c.sortMultiSortKey],k=g(a);k.trigger("sortStart",a);b.count=d[c.sortResetKey]?2:(b.count+1)%(c.sortReset?3:2);c.sortRestart&&(e=b,c.$headers.each(function(){this===e||!v&&g(this).is("."+f.css.sortDesc+",."+f.css.sortAsc)||(this.count=-1)}));e=b.column;if(v){c.sortList=[];if(null!==c.sortForce)for(h=c.sortForce,d=0;d<h.length;d++)h[d][0]!==e&& c.sortList.push(h[d]);h=b.order[b.count];if(2>h&&(c.sortList.push([e,h]),1<b.colSpan))for(d=1;d<b.colSpan;d++)c.sortList.push([e+d,h])}else if(c.sortAppend&&1<c.sortList.length&&f.isValueInArray(c.sortAppend[0][0],c.sortList)&&c.sortList.pop(),f.isValueInArray(e,c.sortList))for(d=0;d<c.sortList.length;d++)n=c.sortList[d],h=c.$headers[n[0]],n[0]===e&&(n[1]=h.order[b.count],2===n[1]&&(c.sortList.splice(d,1),h.count=-1));else if(h=b.order[b.count],2>h&&(c.sortList.push([e,h]),1<b.colSpan))for(d=1;d< b.colSpan;d++)c.sortList.push([e+d,h]);if(null!==c.sortAppend)for(h=c.sortAppend,d=0;d<h.length;d++)h[d][0]!==e&&c.sortList.push(h[d]);k.trigger("sortBegin",a);setTimeout(function(){G(a);H(a);z(a)},1)}function H(a){var b,d,c,e,n,l,g,p,m,x,t,u,s=0,r=a.config,w=r.textSorter||"",z=r.sortList,B=z.length,C=a.tBodies.length;if(!r.serverSideSorting&&!k(r.cache)){r.debug&&(m=new Date);for(d=0;d<C;d++)n=r.cache[d].colMax,p=(l=r.cache[d].normalized)&&l[0]?l[0].length-1:0,l.sort(function(d,l){for(b=0;b<B;b++){e= z[b][0];g=z[b][1];s=0===g;if(r.sortStable&&d[e]===l[e]&&1===B)break;(c=/n/i.test(N(r.parsers,e)))&&r.strings[e]?(c="boolean"===typeof r.string[r.strings[e]]?(s?1:-1)*(r.string[r.strings[e]]?-1:1):r.strings[e]?r.string[r.strings[e]]||0:0,x=r.numberSorter?r.numberSorter(t[e],u[e],s,n[e],a):f["sortNumeric"+(s?"Asc":"Desc")](d[e],l[e],c,n[e],e,a)):(t=s?d:l,u=s?l:d,x="function"===typeof w?w(t[e],u[e],s,e,a):"object"===typeof w&&w.hasOwnProperty(e)?w[e](t[e],u[e],s,e,a):f["sortNatural"+(s?"Asc":"Desc")](d[e], l[e],e,a,r));if(x)return x}return d[p]-l[p]});r.debug&&q("Sorting on "+z.toString()+" and dir "+g+" time",m)}}function J(a,b){var d=a[0].config;d.pager&&!d.pager.ajax&&a.trigger("updateComplete");"function"===typeof b&&b(a[0])}function F(a,b,d){!1===b||a[0].isProcessing?J(a,d):a.trigger("sorton",[a[0].config.sortList,function(){J(a,d)}])}function K(a){var b=a.config,d=b.$table,c,e;b.$headers.find(b.selectorSort).add(b.$headers.filter(b.selectorSort)).unbind("mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter").bind("mousedown.tablesorter mouseup.tablesorter sort.tablesorter keypress.tablesorter", function(d,c){if(!(1!==(d.which||d.button)&&!/sort|keypress/.test(d.type)||"keypress"===d.type&&13!==d.which||"mouseup"===d.type&&!0!==c&&250<(new Date).getTime()-e)){if("mousedown"===d.type)return e=(new Date).getTime(),"INPUT"===d.target.tagName?"":!b.cancelSelection;b.delayInit&&k(b.cache)&&w(a);var h=(/TH|TD/.test(this.tagName)?g(this):g(this).parents("th, td").filter(":first"))[0];h.sortDisabled||O(a,h,d)}});b.cancelSelection&&b.$headers.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none", MozUserSelect:"none"});d.unbind("sortReset update updateRows updateCell updateAll addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(".tablesorter ")).bind("sortReset.tablesorter",function(d){d.stopPropagation();b.sortList=[];G(a);H(a);z(a)}).bind("updateAll.tablesorter",function(b,d,c){b.stopPropagation();f.refreshWidgets(a,!0,!0);f.restoreHeaders(a);E(a);K(a);C(a,d,c)}).bind("update.tablesorter updateRows.tablesorter",function(b,d,c){b.stopPropagation(); I(a);C(a,d,c)}).bind("updateCell.tablesorter",function(c,e,h,f){c.stopPropagation();d.find(b.selectorRemove).remove();var m,k,q;m=d.find("tbody");c=m.index(g(e).parents("tbody").filter(":first"));var s=g(e).parents("tr").filter(":first");e=g(e)[0];m.length&&0<=c&&(k=m.eq(c).find("tr").index(s),q=e.cellIndex,m=b.cache[c].normalized[k].length-1,b.cache[c].row[a.config.cache[c].normalized[k][m]]=s,b.cache[c].normalized[k][q]=b.parsers[q].format(p(a,e,q),a,e,q),F(d,h,f))}).bind("addRows.tablesorter", function(e,f,g,k){e.stopPropagation();var m=f.filter("tr").length,q=[],w=f[0].cells.length,u=d.find("tbody").index(f.parents("tbody").filter(":first"));b.parsers||s(a);for(e=0;e<m;e++){for(c=0;c<w;c++)q[c]=b.parsers[c].format(p(a,f[e].cells[c],c),a,f[e].cells[c],c);q.push(b.cache[u].row.length);b.cache[u].row.push([f[e]]);b.cache[u].normalized.push(q);q=[]}F(d,g,k)}).bind("sorton.tablesorter",function(b,c,e,h){var f=a.config;b.stopPropagation();d.trigger("sortStart",this);M(a,c);G(a);f.delayInit&& k(f.cache)&&w(a);d.trigger("sortBegin",this);H(a);z(a,h);"function"===typeof e&&e(a)}).bind("appendCache.tablesorter",function(b,d,c){b.stopPropagation();z(a,c);"function"===typeof d&&d(a)}).bind("applyWidgetId.tablesorter",function(d,c){d.stopPropagation();f.getWidgetById(c).format(a,b,b.widgetOptions)}).bind("applyWidgets.tablesorter",function(b,d){b.stopPropagation();f.applyWidget(a,d)}).bind("refreshWidgets.tablesorter",function(b,d,c){b.stopPropagation();f.refreshWidgets(a,d,c)}).bind("destroy.tablesorter", function(b,d,c){b.stopPropagation();f.destroy(a,d,c)})}var f=this;f.version="2.14.0";f.parsers=[];f.widgets=[];f.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc", sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"simple",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[], empties:{},strings:{},parsers:[]};f.css={table:"tablesorter",childRow:"tablesorter-childRow",header:"tablesorter-header",headerRow:"tablesorter-headerRow",icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc"};f.log=c;f.benchmark=q;f.construct=function(a){return this.each(function(){var b=g.extend(!0,{},f.defaults,a);!this.hasInitialized&&f.buildTable&&"TABLE"!==this.tagName&&f.buildTable(this,b);f.setup(this, b)})};f.setup=function(a,b){if(!a||!a.tHead||0===a.tBodies.length||!0===a.hasInitialized)return b.debug?c("stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var d="",h=g(a),e=g.metadata;a.hasInitialized=!1;a.isProcessing=!0;a.config=b;g.data(a,"tablesorter",b);b.debug&&g.data(a,"startoveralltimer",new Date);b.supportsTextContent="x"===g("<span>x</span>")[0].textContent;b.supportsDataObject=function(a){a[0]=parseInt(a[0],10);return 1<a[0]||1===a[0]&&4<= parseInt(a[1],10)}(g.fn.jquery.split("."));b.string={max:1,min:-1,"max+":1,"max-":-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(h.attr("class"))||(d=""!==b.theme?" tablesorter-"+b.theme:"");b.$table=h.addClass(f.css.table+" "+b.tableClass+d);b.$tbodies=h.children("tbody:not(."+b.cssInfoBlock+")");b.widgetInit={};E(a);L(a);s(a);b.delayInit||w(a);K(a);b.supportsDataObject&&"undefined"!==typeof h.data().sortlist?b.sortList=h.data().sortlist:e&&h.metadata()&&h.metadata().sortlist&& (b.sortList=h.metadata().sortlist);f.applyWidget(a,!0);0<b.sortList.length?h.trigger("sorton",[b.sortList,{},!b.initWidgets]):b.initWidgets&&f.applyWidget(a);b.showProcessing&&h.unbind("sortBegin.tablesorter sortEnd.tablesorter").bind("sortBegin.tablesorter sortEnd.tablesorter",function(b){f.isProcessing(a,"sortBegin"===b.type)});a.hasInitialized=!0;a.isProcessing=!1;b.debug&&f.benchmark("Overall initialization time",g.data(a,"startoveralltimer"));h.trigger("tablesorter-initialized",a);"function"=== typeof b.initialized&&b.initialized(a)};f.isProcessing=function(a,b,d){a=g(a);var c=a[0].config;a=d||a.find("."+f.css.header);b?(0<c.sortList.length&&(a=a.filter(function(){return this.sortDisabled?!1:f.isValueInArray(parseFloat(g(this).attr("data-column")),c.sortList)})),a.addClass(f.css.processing+" "+c.cssProcessing)):a.removeClass(f.css.processing+" "+c.cssProcessing)};f.processTbody=function(a,b,d){if(d)return a.isProcessing=!0,b.before('<span class="tablesorter-savemyplace"/>'),d=g.fn.detach? b.detach():b.remove();d=g(a).find("span.tablesorter-savemyplace");b.insertAfter(d);d.remove();a.isProcessing=!1};f.clearTableBody=function(a){g(a)[0].config.$tbodies.empty()};f.restoreHeaders=function(a){var b=a.config;b.$table.find(b.selectorHeaders).each(function(a){g(this).find(".tablesorter-header-inner").length&&g(this).html(b.headerContent[a])})};f.destroy=function(a,b,d){a=g(a)[0];if(a.hasInitialized){f.refreshWidgets(a,!0,!0);var c=g(a),e=a.config,n=c.find("thead:first"),l=n.find("tr."+f.css.headerRow).removeClass(f.css.headerRow+ " "+e.cssHeaderRow),k=c.find("tfoot:first > tr").children("th, td");n.find("tr").not(l).remove();c.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd ".split(" ").join(".tablesorter "));e.$headers.add(k).removeClass([f.css.header,e.cssHeader,e.cssAsc,e.cssDesc,f.css.sortAsc,f.css.sortDesc].join(" ")).removeAttr("data-column");l.find(e.selectorSort).unbind("mousedown.tablesorter mouseup.tablesorter keypress.tablesorter"); f.restoreHeaders(a);!1!==b&&c.removeClass(f.css.table+" "+e.tableClass+" tablesorter-"+e.theme);a.hasInitialized=!1;"function"===typeof d&&d(a)}};f.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,hex:/^0x[0-9a-f]+$/i};f.sortNatural=function(a,b){if(a===b)return 0;var d,c,e,g,l,k;c=f.regex;if(c.hex.test(b)){d=parseInt(a.match(c.hex),16);e=parseInt(b.match(c.hex),16);if(d<e)return-1;if(d>e)return 1}d=a.replace(c.chunk,"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/, "").split("\\0");c=b.replace(c.chunk,"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");k=Math.max(d.length,c.length);for(l=0;l<k;l++){e=isNaN(d[l])?d[l]||0:parseFloat(d[l])||0;g=isNaN(c[l])?c[l]||0:parseFloat(c[l])||0;if(isNaN(e)!==isNaN(g))return isNaN(e)?1:-1;typeof e!==typeof g&&(e+="",g+="");if(e<g)return-1;if(e>g)return 1}return 0};f.sortNaturalAsc=function(a,b,d,c,e){if(a===b)return 0;d=e.string[e.empties[d]||e.emptyTo];return""===a&&0!==d?"boolean"===typeof d?d?-1:1:-d||-1:""=== b&&0!==d?"boolean"===typeof d?d?1:-1:d||1:f.sortNatural(a,b)};f.sortNaturalDesc=function(a,b,d,c,e){if(a===b)return 0;d=e.string[e.empties[d]||e.emptyTo];return""===a&&0!==d?"boolean"===typeof d?d?-1:1:d||1:""===b&&0!==d?"boolean"===typeof d?d?1:-1:-d||-1:f.sortNatural(b,a)};f.sortText=function(a,b){return a>b?1:a<b?-1:0};f.getTextValue=function(a,b,d){if(d){var c=a?a.length:0,e=d+b;for(d=0;d<c;d++)e+=a.charCodeAt(d);return b*e}return 0};f.sortNumericAsc=function(a,b,d,c,e,g){if(a===b)return 0;g= g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===a&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===b&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(a)&&(a=f.getTextValue(a,d,c));isNaN(b)&&(b=f.getTextValue(b,d,c));return a-b};f.sortNumericDesc=function(a,b,d,c,e,g){if(a===b)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===a&&0!==e)return"boolean"===typeof e?e?-1:1:e||1;if(""===b&&0!==e)return"boolean"===typeof e?e?1:-1:-e||-1;isNaN(a)&&(a=f.getTextValue(a,d,c));isNaN(b)&& (b=f.getTextValue(b,d,c));return b-a};f.sortNumeric=function(a,b){return a-b};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119",E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f", U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(a){var b,d="[",c=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(b in c)"string"===typeof b&&(d+=c[b],f.characterRegexArray[b]=RegExp("["+c[b]+"]","g"));f.characterRegex=RegExp(d+"]")}if(f.characterRegex.test(a))for(b in c)"string"===typeof b&&(a=a.replace(f.characterRegexArray[b],b));return a};f.isValueInArray=function(a,b){var d,c=b.length;for(d=0;d<c;d++)if(b[d][0]===a)return!0;return!1};f.addParser=function(a){var b, d=f.parsers.length,c=!0;for(b=0;b<d;b++)f.parsers[b].id.toLowerCase()===a.id.toLowerCase()&&(c=!1);c&&f.parsers.push(a)};f.getParserById=function(a){var b,d=f.parsers.length;for(b=0;b<d;b++)if(f.parsers[b].id.toLowerCase()===a.toString().toLowerCase())return f.parsers[b];return!1};f.addWidget=function(a){f.widgets.push(a)};f.getWidgetById=function(a){var b,d,c=f.widgets.length;for(b=0;b<c;b++)if((d=f.widgets[b])&&d.hasOwnProperty("id")&&d.id.toLowerCase()===a.toLowerCase())return d};f.applyWidget= function(a,b){a=g(a)[0];var d=a.config,c=d.widgetOptions,e=[],k,l,p;d.debug&&(k=new Date);d.widgets.length&&(d.widgets=g.grep(d.widgets,function(a,b){return g.inArray(a,d.widgets)===b}),g.each(d.widgets||[],function(a,b){(p=f.getWidgetById(b))&&p.id&&(p.priority||(p.priority=10),e[a]=p)}),e.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g.each(e,function(e,f){if(f){if(b||!d.widgetInit[f.id])f.hasOwnProperty("options")&&(c=a.config.widgetOptions=g.extend(!0,{},f.options, c),d.widgetInit[f.id]=!0),f.hasOwnProperty("init")&&f.init(a,f,d,c);!b&&f.hasOwnProperty("format")&&f.format(a,d,c,!1)}}));d.debug&&(l=d.widgets.length,q("Completed "+(!0===b?"initializing ":"applying ")+l+" widget"+(1!==l?"s":""),k))};f.refreshWidgets=function(a,b,d){a=g(a)[0];var h,e=a.config,k=e.widgets,l=f.widgets,q=l.length;for(h=0;h<q;h++)l[h]&&l[h].id&&(b||0>g.inArray(l[h].id,k))&&(e.debug&&c("Refeshing widgets: Removing "+l[h].id),l[h].hasOwnProperty("remove")&&(l[h].remove(a,e,e.widgetOptions), e.widgetInit[l[h].id]=!1));!0!==d&&f.applyWidget(a,b)};f.getData=function(a,b,d){var c="";a=g(a);var e,f;if(!a.length)return"";e=g.metadata?a.metadata():!1;f=" "+(a.attr("class")||"");"undefined"!==typeof a.data(d)||"undefined"!==typeof a.data(d.toLowerCase())?c+=a.data(d)||a.data(d.toLowerCase()):e&&"undefined"!==typeof e[d]?c+=e[d]:b&&"undefined"!==typeof b[d]?c+=b[d]:" "!==f&&f.match(" "+d+"-")&&(c=f.match(RegExp("\\s"+d+"-([\\w-]+)"))[1]||"");return g.trim(c)};f.formatFloat=function(a,b){if("string"!== typeof a||""===a)return a;var c;a=(b&&b.config?!1!==b.config.usNumberFormat:"undefined"!==typeof b?b:1)?a.replace(/,/g,""):a.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(a)&&(a=a.replace(/^\s*\(([.\d]+)\)/,"-$1"));c=parseFloat(a);return isNaN(c)?g.trim(a):c};f.isDigit=function(a){return isNaN(a)?/^[\-+(]?\d+[)]?$/.test(a.toString().replace(/[,.'"\s]/g,"")):!0}}});var p=g.tablesorter;g.fn.extend({tablesorter:p.construct});p.addParser({id:"text",is:function(){return!0},format:function(c, q){var k=q.config;c&&(c=g.trim(k.ignoreCase?c.toLocaleLowerCase():c),c=k.sortLocaleCompare?p.replaceAccents(c):c);return c},type:"text"});p.addParser({id:"digit",is:function(c){return p.isDigit(c)},format:function(c,q){var k=p.formatFloat((c||"").replace(/[^\w,. \-()]/g,""),q);return c&&"number"===typeof k?k:c?g.trim(c&&q.config.ignoreCase?c.toLocaleLowerCase():c):c},type:"numeric"});p.addParser({id:"currency",is:function(c){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((c|| "").replace(/[,. ]/g,""))},format:function(c,q){var k=p.formatFloat((c||"").replace(/[^\w,. \-()]/g,""),q);return c&&"number"===typeof k?k:c?g.trim(c&&q.config.ignoreCase?c.toLocaleLowerCase():c):c},type:"numeric"});p.addParser({id:"ipAddress",is:function(c){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(c)},format:function(c,g){var k,t=c?c.split("."):"",s="",w=t.length;for(k=0;k<w;k++)s+=("00"+t[k]).slice(-3);return c?p.formatFloat(s,g):c},type:"numeric"});p.addParser({id:"url",is:function(c){return/^(https?|ftp|file):\/\//.test(c)}, format:function(c){return c?g.trim(c.replace(/(https?|ftp|file):\/\//,"")):c},type:"text"});p.addParser({id:"isoDate",is:function(c){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(c)},format:function(c,g){return c?p.formatFloat(""!==c?(new Date(c.replace(/-/g,"/"))).getTime()||"":"",g):c},type:"numeric"});p.addParser({id:"percent",is:function(c){return/(\d\s*?%|%\s*?\d)/.test(c)&&15>c.length},format:function(c,g){return c?p.formatFloat(c.replace(/%/g,""),g):c},type:"numeric"});p.addParser({id:"usLongDate", is:function(c){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(c)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(c)},format:function(c,g){return c?p.formatFloat((new Date(c.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",g):c},type:"numeric"});p.addParser({id:"shortDate",is:function(c){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((c||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(c,g,k,t){if(c){k=g.config; var s=k.headerList[t];t=s.dateFormat||p.getData(s,k.headers[t],"dateFormat")||k.dateFormat;c=c.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===t?c=c.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===t?c=c.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===t&&(c=c.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"))}return c?p.formatFloat((new Date(c)).getTime()||"",g):c},type:"numeric"});p.addParser({id:"time",is:function(c){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(c)}, format:function(c,g){return c?p.formatFloat((new Date("2000/01/01 "+c.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",g):c},type:"numeric"});p.addParser({id:"metadata",is:function(){return!1},format:function(c,p,k){c=p.config;c=c.parserMetadataName?c.parserMetadataName:"sortValue";return g(k).metadata()[c]},type:"numeric"});p.addWidget({id:"zebra",priority:90,format:function(c,q,k){var t,s,w,z,D,B,E=RegExp(q.cssChildRow,"i"),C=q.$tbodies;q.debug&&(D=new Date);for(c=0;c<C.length;c++)t=C.eq(c),B=t.children("tr").length, 1<B&&(w=0,t=t.children("tr:visible").not(q.selectorRemove),t.each(function(){s=g(this);E.test(this.className)||w++;z=0===w%2;s.removeClass(k.zebra[z?1:0]).addClass(k.zebra[z?0:1])}));q.debug&&p.benchmark("Applying Zebra widget",D)},remove:function(c,p,k){var t;p=p.$tbodies;var s=(k.zebra||["even","odd"]).join(" ");for(k=0;k<p.length;k++)t=g.tablesorter.processTbody(c,p.eq(k),!0),t.children().removeClass(s),g.tablesorter.processTbody(c,t,!1)}})}(jQuery);
diff --git a/data/js/lib/jquery.tablesorter-2.16.3.min.js b/data/js/lib/jquery.tablesorter-2.16.3.min.js
new file mode 100644
index 0000000000..9bcc4b322e
--- /dev/null
+++ b/data/js/lib/jquery.tablesorter-2.16.3.min.js
@@ -0,0 +1,5 @@
+/*!
+* TableSorter 2.16.3 min - Client-side table sorting with ease!
+* Copyright (c) 2007 Christian Bach
+*/
+!function(g){g.extend({tablesorter:new function(){function d(){var b=arguments[0],a=1<arguments.length?Array.prototype.slice.call(arguments):b;if("undefined"!==typeof console&&"undefined"!==typeof console.log)console[/error/i.test(b)?"error":/warn/i.test(b)?"warn":"log"](a);else alert(a)}function u(b,a){d(b+" ("+((new Date).getTime()-a.getTime())+"ms)")}function n(b){for(var a in b)return!1;return!0}function p(b,a,c){if(!a)return"";var h=b.config,e=h.textExtraction||"",f="",f="basic"===e?g(a).attr(h.textAttribute)|| a.textContent||a.innerText||g(a).text()||"":"function"===typeof e?e(a,b,c):"object"===typeof e&&e.hasOwnProperty(c)?e[c](a,b,c):a.textContent||a.innerText||g(a).text()||"";return g.trim(f)}function s(b){var a=b.config,c=a.$tbodies=a.$table.children("tbody:not(."+a.cssInfoBlock+")"),h,e,t,k,l,m,g,n,w=0,q="",r=c.length;if(0===r)return a.debug?d("Warning: *Empty table!* Not building a parser cache"):"";a.debug&&(n=new Date,d("Detecting parsers for each column"));for(e=[];w<r;){h=c[w].rows;if(h[w])for(t= h[w].cells.length,k=0;k<t;k++){l=a.$headers.filter(":not([colspan])");l=l.add(a.$headers.filter('[colspan="1"]')).filter('[data-column="'+k+'"]:last');m=a.$headers.index(l);m=a.headers[m];g=f.getParserById(f.getData(l,m,"sorter"));a.empties[k]=f.getData(l,m,"empty")||a.emptyTo||(a.emptyToBottom?"bottom":"top");a.strings[k]=f.getData(l,m,"string")||a.stringTo||"max";if(!g)a:{l=b;m=h;g=-1;for(var s=k,A=void 0,x=f.parsers.length,y=!1,F="",A=!0;""===F&&A;)g++,m[g]?(y=m[g].cells[s],F=p(l,y,s),l.config.debug&& d("Checking if value was empty on row "+g+", column: "+s+': "'+F+'"')):A=!1;for(;0<=--x;)if((A=f.parsers[x])&&"text"!==A.id&&A.is&&A.is(F,l,y)){g=A;break a}g=f.getParserById("text")}a.debug&&(q+="column:"+k+"; parser:"+g.id+"; string:"+a.strings[k]+"; empty: "+a.empties[k]+"\n");e.push(g)}w+=e.length?r:1}a.debug&&(d(q?q:"No parsers detected"),u("Completed detecting parsers",n));a.parsers=e}function x(b){var a,c,h,e,t,k,l,m,z,n,w,q=b.config,r=q.$table.children("tbody"),s=q.parsers;q.cache={};if(!s)return q.debug? d("Warning: *Empty table!* Not building a cache"):"";q.debug&&(m=new Date);q.showProcessing&&f.isProcessing(b,!0);for(t=0;t<r.length;t++)if(w=[],a=q.cache[t]={normalized:[]},!r.eq(t).hasClass(q.cssInfoBlock)){z=r[t]&&r[t].rows.length||0;for(h=0;h<z;++h)if(n={child:[]},k=g(r[t].rows[h]),l=[],k.hasClass(q.cssChildRow)&&0!==h)c=a.normalized.length-1,a.normalized[c][q.columns].$row=a.normalized[c][q.columns].$row.add(k),k.prev().hasClass(q.cssChildRow)||k.prev().addClass(f.css.cssHasChild),n.child[c]= g.trim(k[0].textContent||k[0].innerText||k.text()||"");else{n.$row=k;n.order=h;for(e=0;e<q.columns;++e)"undefined"===typeof s[e]?q.debug&&d("No parser found for cell:",k[0].cells[e],"does it have a header?"):(c=p(b,k[0].cells[e],e),c=s[e].format(c,b,k[0].cells[e],e),l.push(c),"numeric"===(s[e].type||"").toLowerCase()&&(w[e]=Math.max(Math.abs(c)||0,w[e]||0)));l[q.columns]=n;a.normalized.push(l)}a.colMax=w}q.showProcessing&&f.isProcessing(b);q.debug&&u("Building cache for "+z+" rows",m)}function y(b, a){var c=b.config,h=c.widgetOptions,e=b.tBodies,t=[],k=c.cache,d,m,z,p,w,q;if(n(k))return c.appender?c.appender(b,t):b.isUpdating?c.$table.trigger("updateComplete",b):"";c.debug&&(q=new Date);for(w=0;w<e.length;w++)if(d=g(e[w]),d.length&&!d.hasClass(c.cssInfoBlock)){z=f.processTbody(b,d,!0);d=k[w].normalized;m=d.length;for(p=0;p<m;p++)t.push(d[p][c.columns].$row),c.appender&&(!c.pager||c.pager.removeRows&&h.pager_removeRows||c.pager.ajax)||z.append(d[p][c.columns].$row);f.processTbody(b,z,!1)}c.appender&& c.appender(b,t);c.debug&&u("Rebuilt table",q);a||c.appender||f.applyWidget(b);b.isUpdating&&c.$table.trigger("updateComplete",b)}function C(b){return/^d/i.test(b)||1===b}function D(b){var a,c,h,e,t,k,l,m=b.config;m.headerList=[];m.headerContent=[];m.debug&&(l=new Date);m.columns=f.computeColumnIndex(m.$table.children("thead, tfoot").children("tr"));e=m.cssIcon?'<i class="'+(m.cssIcon===f.css.icon?f.css.icon:m.cssIcon+" "+f.css.icon)+'"></i>':"";m.$headers=g(b).find(m.selectorHeaders).each(function(b){c= g(this);a=m.headers[b];m.headerContent[b]=g(this).html();t=m.headerTemplate.replace(/\{content\}/g,g(this).html()).replace(/\{icon\}/g,e);m.onRenderTemplate&&(h=m.onRenderTemplate.apply(c,[b,t]))&&"string"===typeof h&&(t=h);g(this).html('<div class="'+f.css.headerIn+'">'+t+"</div>");m.onRenderHeader&&m.onRenderHeader.apply(c,[b]);this.column=parseInt(g(this).attr("data-column"),10);this.order=C(f.getData(c,a,"sortInitialOrder")||m.sortInitialOrder)?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder=!1; k=f.getData(c,a,"lockedOrder")||!1;"undefined"!==typeof k&&!1!==k&&(this.order=this.lockedOrder=C(k)?[1,1,1]:[0,0,0]);c.addClass(f.css.header+" "+m.cssHeader);m.headerList[b]=this;c.parent().addClass(f.css.headerRow+" "+m.cssHeaderRow).attr("role","row");m.tabIndex&&c.attr("tabindex",0)}).attr({scope:"col",role:"columnheader"});B(b);m.debug&&(u("Built headers:",l),d(m.$headers))}function E(b,a,c){var h=b.config;h.$table.find(h.selectorRemove).remove();s(b);x(b);H(h.$table,a,c)}function B(b){var a, c,h=b.config;h.$headers.each(function(e,t){c=g(t);a="false"===f.getData(t,h.headers[e],"sorter");t.sortDisabled=a;c[a?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+a);b.id&&(a?c.removeAttr("aria-controls"):c.attr("aria-controls",b.id))})}function G(b){var a,c,h=b.config,e=h.sortList,t=e.length,d=f.css.sortNone+" "+h.cssNone,l=[f.css.sortAsc+" "+h.cssAsc,f.css.sortDesc+" "+h.cssDesc],m=["ascending","descending"],n=g(b).find("tfoot tr").children().add(h.$extraHeaders).removeClass(l.join(" ")); h.$headers.removeClass(l.join(" ")).addClass(d).attr("aria-sort","none");for(a=0;a<t;a++)if(2!==e[a][1]&&(b=h.$headers.not(".sorter-false").filter('[data-column="'+e[a][0]+'"]'+(1===t?":last":"")),b.length)){for(c=0;c<b.length;c++)b[c].sortDisabled||b.eq(c).removeClass(d).addClass(l[e[a][1]]).attr("aria-sort",m[e[a][1]]);n.length&&n.filter('[data-column="'+e[a][0]+'"]').removeClass(d).addClass(l[e[a][1]])}h.$headers.not(".sorter-false").each(function(){var b=g(this),a=this.order[(this.count+1)%(h.sortReset? 3:2)],a=b.text()+": "+f.language[b.hasClass(f.css.sortAsc)?"sortAsc":b.hasClass(f.css.sortDesc)?"sortDesc":"sortNone"]+f.language[0===a?"nextAsc":1===a?"nextDesc":"nextNone"];b.attr("aria-label",a)})}function L(b){if(b.config.widthFixed&&0===g(b).find("colgroup").length){var a=g("<colgroup>"),c=g(b).width();g(b.tBodies[0]).find("tr:first").children("td:visible").each(function(){a.append(g("<col>").css("width",parseInt(g(this).width()/c*1E3,10)/10+"%"))});g(b).prepend(a)}}function M(b,a,c){var h,e, f,d=b.config;b=a||d.sortList;d.sortList=[];g.each(b,function(b,a){h=[parseInt(a[0],10),parseInt(a[1],10)];if(f=d.$headers.filter('[data-column="'+h[0]+'"]:last')[0])d.sortList.push(h),e=g.inArray(h[1],f.order),c&&(f.count+=1),f.count=0<=e?e:h[1]%(d.sortReset?3:2)})}function N(b,a){return b&&b[a]?b[a].type||"":""}function O(b,a,c){var h,e,d,k=b.config,l=!c[k.sortMultiSortKey],m=k.$table;m.trigger("sortStart",b);a.count=c[k.sortResetKey]?2:(a.count+1)%(k.sortReset?3:2);k.sortRestart&&(e=a,k.$headers.each(function(){this=== e||!l&&g(this).is("."+f.css.sortDesc+",."+f.css.sortAsc)||(this.count=-1)}));e=a.column;if(l){k.sortList=[];if(null!==k.sortForce)for(h=k.sortForce,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);h=a.order[a.count];if(2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+c,h])}else{if(k.sortAppend&&1<k.sortList.length)for(c=0;c<k.sortAppend.length;c++)d=f.isValueInArray(k.sortAppend[c][0],k.sortList),0<=d&&k.sortList.splice(d,1);if(0<=f.isValueInArray(e,k.sortList))for(c= 0;c<k.sortList.length;c++)d=k.sortList[c],h=k.$headers.filter('[data-column="'+d[0]+'"]:last')[0],d[0]===e&&(d[1]=h.order[a.count],2===d[1]&&(k.sortList.splice(c,1),h.count=-1));else if(h=a.order[a.count],2>h&&(k.sortList.push([e,h]),1<a.colSpan))for(c=1;c<a.colSpan;c++)k.sortList.push([e+c,h])}if(null!==k.sortAppend)for(h=k.sortAppend,c=0;c<h.length;c++)h[c][0]!==e&&k.sortList.push(h[c]);m.trigger("sortBegin",b);setTimeout(function(){G(b);I(b);y(b);m.trigger("sortEnd",b)},1)}function I(b){var a, c,h,e,d,k,g,m,z,p,w,q=0,r=b.config,s=r.textSorter||"",v=r.sortList,x=v.length,y=b.tBodies.length;if(!r.serverSideSorting&&!n(r.cache)){r.debug&&(d=new Date);for(c=0;c<y;c++)k=r.cache[c].colMax,g=r.cache[c].normalized,g.sort(function(c,d){for(a=0;a<x;a++){e=v[a][0];m=v[a][1];q=0===m;if(r.sortStable&&c[e]===d[e]&&1===x)break;(h=/n/i.test(N(r.parsers,e)))&&r.strings[e]?(h="boolean"===typeof r.string[r.strings[e]]?(q?1:-1)*(r.string[r.strings[e]]?-1:1):r.strings[e]?r.string[r.strings[e]]||0:0,z=r.numberSorter? r.numberSorter(c[e],d[e],q,k[e],b):f["sortNumeric"+(q?"Asc":"Desc")](c[e],d[e],h,k[e],e,b)):(p=q?c:d,w=q?d:c,z="function"===typeof s?s(p[e],w[e],q,e,b):"object"===typeof s&&s.hasOwnProperty(e)?s[e](p[e],w[e],q,e,b):f["sortNatural"+(q?"Asc":"Desc")](c[e],d[e],e,b,r));if(z)return z}return c[r.columns].order-d[r.columns].order});r.debug&&u("Sorting on "+v.toString()+" and dir "+m+" time",d)}}function J(b,a){b[0].isUpdating&&b.trigger("updateComplete");g.isFunction(a)&&a(b[0])}function H(b,a,c){var h= b[0].config.sortList;!1!==a&&!b[0].isProcessing&&h.length?b.trigger("sorton",[h,function(){J(b,c)},!0]):(J(b,c),f.applyWidget(b[0],!1))}function K(b){var a=b.config,c=a.$table;c.unbind("sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(a.namespace+" ")).bind("sortReset"+a.namespace,function(c,e){c.stopPropagation();a.sortList=[];G(b);I(b);y(b);g.isFunction(e)&& e(b)}).bind("updateAll"+a.namespace,function(c,e,d){c.stopPropagation();b.isUpdating=!0;f.refreshWidgets(b,!0,!0);f.restoreHeaders(b);D(b);f.bindEvents(b,a.$headers,!0);K(b);E(b,e,d)}).bind("update"+a.namespace+" updateRows"+a.namespace,function(a,c,d){a.stopPropagation();b.isUpdating=!0;B(b);E(b,c,d)}).bind("updateCell"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating=!0;c.find(a.selectorRemove).remove();var l,m;l=c.find("tbody");m=g(e);h=l.index(g.fn.closest?m.closest("tbody"):m.parents("tbody").filter(":first")); var n=g.fn.closest?m.closest("tr"):m.parents("tr").filter(":first");e=m[0];l.length&&0<=h&&(l=l.eq(h).find("tr").index(n),m=m.index(),a.cache[h].normalized[l][a.columns].$row=n,e=a.cache[h].normalized[l][m]=a.parsers[m].format(p(b,e,m),b,e,m),"numeric"===(a.parsers[m].type||"").toLowerCase()&&(a.cache[h].colMax[m]=Math.max(Math.abs(e)||0,a.cache[h].colMax[m]||0)),H(c,d,f))}).bind("addRows"+a.namespace,function(h,e,d,f){h.stopPropagation();b.isUpdating=!0;if(n(a.cache))B(b),E(b,d,f);else{e=g(e);var l, m,u,x,w=e.filter("tr").length,q=c.find("tbody").index(e.parents("tbody").filter(":first"));a.parsers&&a.parsers.length||s(b);for(h=0;h<w;h++){m=e[h].cells.length;x=[];u={child:[],$row:e.eq(h),order:a.cache[q].normalized.length};for(l=0;l<m;l++)x[l]=a.parsers[l].format(p(b,e[h].cells[l],l),b,e[h].cells[l],l),"numeric"===(a.parsers[l].type||"").toLowerCase()&&(a.cache[q].colMax[l]=Math.max(Math.abs(x[l])||0,a.cache[q].colMax[l]||0));x.push(u);a.cache[q].normalized.push(x)}H(c,d,f)}}).bind("updateComplete"+ a.namespace,function(){b.isUpdating=!1}).bind("sorton"+a.namespace,function(a,e,d,k){var l=b.config;a.stopPropagation();c.trigger("sortStart",this);M(b,e,!0);G(b);l.delayInit&&n(l.cache)&&x(b);c.trigger("sortBegin",this);I(b);y(b,k);c.trigger("sortEnd",this);f.applyWidget(b);g.isFunction(d)&&d(b)}).bind("appendCache"+a.namespace,function(a,c,d){a.stopPropagation();y(b,d);g.isFunction(c)&&c(b)}).bind("updateCache"+a.namespace,function(c,e){a.parsers&&a.parsers.length||s(b);x(b);g.isFunction(e)&&e(b)}).bind("applyWidgetId"+ a.namespace,function(c,e){c.stopPropagation();f.getWidgetById(e).format(b,a,a.widgetOptions)}).bind("applyWidgets"+a.namespace,function(a,c){a.stopPropagation();f.applyWidget(b,c)}).bind("refreshWidgets"+a.namespace,function(a,c,d){a.stopPropagation();f.refreshWidgets(b,c,d)}).bind("destroy"+a.namespace,function(a,c,d){a.stopPropagation();f.destroy(b,c,d)})}var f=this;f.version="2.16.3";f.parsers=[];f.widgets=[];f.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}", onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even", "odd"]},initWidgets:!0,initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};f.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",header:"tablesorter-header", headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"};f.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"}; f.log=d;f.benchmark=u;f.construct=function(b){return this.each(function(){var a=g.extend(!0,{},f.defaults,b);!this.hasInitialized&&f.buildTable&&"TABLE"!==this.tagName?f.buildTable(this,a):f.setup(this,a)})};f.setup=function(b,a){if(!b||!b.tHead||0===b.tBodies.length||!0===b.hasInitialized)return a.debug?d("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var c="",h=g(b),e=g.metadata;b.hasInitialized=!1;b.isProcessing=!0;b.config=a;g.data(b,"tablesorter", a);a.debug&&g.data(b,"startoveralltimer",new Date);a.supportsDataObject=function(a){a[0]=parseInt(a[0],10);return 1<a[0]||1===a[0]&&4<=parseInt(a[1],10)}(g.fn.jquery.split("."));a.string={max:1,min:-1,emptyMin:1,emptyMax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(h.attr("class"))||(c=""!==a.theme?" tablesorter-"+a.theme:"");a.$table=h.addClass(f.css.table+" "+a.tableClass+c).attr({role:"grid"});a.namespace=a.namespace?"."+a.namespace.replace(/\W/g,""):".tablesorter"+Math.random().toString(16).slice(2); a.$tbodies=h.children("tbody:not(."+a.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"});a.$table.find("caption").length&&a.$table.attr("aria-labelledby","theCaption");a.widgetInit={};a.textExtraction=a.$table.attr("data-text-extraction")||a.textExtraction||"basic";D(b);L(b);s(b);a.delayInit||x(b);f.bindEvents(b,a.$headers,!0);K(b);a.supportsDataObject&&"undefined"!==typeof h.data().sortlist?a.sortList=h.data().sortlist:e&&h.metadata()&&h.metadata().sortlist&&(a.sortList=h.metadata().sortlist); f.applyWidget(b,!0);0<a.sortList.length?h.trigger("sorton",[a.sortList,{},!a.initWidgets,!0]):(G(b),a.initWidgets&&f.applyWidget(b,!1));a.showProcessing&&h.unbind("sortBegin"+a.namespace+" sortEnd"+a.namespace).bind("sortBegin"+a.namespace+" sortEnd"+a.namespace,function(c){clearTimeout(a.processTimer);f.isProcessing(b);"sortBegin"===c.type&&(a.processTimer=setTimeout(function(){f.isProcessing(b,!0)},500))});b.hasInitialized=!0;b.isProcessing=!1;a.debug&&f.benchmark("Overall initialization time", g.data(b,"startoveralltimer"));h.trigger("tablesorter-initialized",b);"function"===typeof a.initialized&&a.initialized(b)};f.computeColumnIndex=function(b){var a=[],c=0,h,e,d,f,l,m,n,u,p,q;for(h=0;h<b.length;h++)for(l=b[h].cells,e=0;e<l.length;e++){d=l[e];f=g(d);m=d.parentNode.rowIndex;f.index();n=d.rowSpan||1;u=d.colSpan||1;"undefined"===typeof a[m]&&(a[m]=[]);for(d=0;d<a[m].length+1;d++)if("undefined"===typeof a[m][d]){p=d;break}c=Math.max(p,c);f.attr({"data-column":p});for(d=m;d<m+n;d++)for("undefined"=== typeof a[d]&&(a[d]=[]),q=a[d],f=p;f<p+u;f++)q[f]="x"}return c+1};f.isProcessing=function(b,a,c){b=g(b);var d=b[0].config;b=c||b.find("."+f.css.header);a?("undefined"!==typeof c&&0<d.sortList.length&&(b=b.filter(function(){return this.sortDisabled?!1:0<=f.isValueInArray(parseFloat(g(this).attr("data-column")),d.sortList)})),b.addClass(f.css.processing+" "+d.cssProcessing)):b.removeClass(f.css.processing+" "+d.cssProcessing)};f.processTbody=function(b,a,c){b=g(b)[0];if(c)return b.isProcessing=!0,a.before('<span class="tablesorter-savemyplace"/>'), c=g.fn.detach?a.detach():a.remove();c=g(b).find("span.tablesorter-savemyplace");a.insertAfter(c);c.remove();b.isProcessing=!1};f.clearTableBody=function(b){g(b)[0].config.$tbodies.empty()};f.bindEvents=function(b,a,c){b=g(b)[0];var d,e=b.config;!0!==c&&(e.$extraHeaders=e.$extraHeaders?e.$extraHeaders.add(a):a);a.find(e.selectorSort).add(a.filter(e.selectorSort)).unbind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+" ")).bind(["mousedown","mouseup","sort","keyup",""].join(e.namespace+ " "),function(c,f){var l;l=c.type;if(!(1!==(c.which||c.button)&&!/sort|keyup/.test(l)||"keyup"===l&&13!==c.which||"mouseup"===l&&!0!==f&&250<(new Date).getTime()-d)){if("mousedown"===l)return d=(new Date).getTime(),"INPUT"===c.target.tagName?"":!e.cancelSelection;e.delayInit&&n(e.cache)&&x(b);l=g.fn.closest?g(this).closest("th, td")[0]:/TH|TD/.test(this.tagName)?this:g(this).parents("th, td")[0];l=e.$headers[a.index(l)];l.sortDisabled||O(b,l,c)}});e.cancelSelection&&a.attr("unselectable","on").bind("selectstart", !1).css({"user-select":"none",MozUserSelect:"none"})};f.restoreHeaders=function(b){var a=g(b)[0].config;a.$table.find(a.selectorHeaders).each(function(b){g(this).find("."+f.css.headerIn).length&&g(this).html(a.headerContent[b])})};f.destroy=function(b,a,c){b=g(b)[0];if(b.hasInitialized){f.refreshWidgets(b,!0,!0);var d=g(b),e=b.config,t=d.find("thead:first"),k=t.find("tr."+f.css.headerRow).removeClass(f.css.headerRow+" "+e.cssHeaderRow),l=d.find("tfoot:first > tr").children("th, td");!1===a&&0<=g.inArray("uitheme", e.widgets)&&(d.trigger("applyWidgetId",["uitheme"]),d.trigger("applyWidgetId",["zebra"]));t.find("tr").not(k).remove();d.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd ".split(" ").join(e.namespace+" "));e.$headers.add(l).removeClass([f.css.header,e.cssHeader,e.cssAsc,e.cssDesc,f.css.sortAsc,f.css.sortDesc,f.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled", "true");k.find(e.selectorSort).unbind(["mousedown","mouseup","keypress",""].join(e.namespace+" "));f.restoreHeaders(b);d.toggleClass(f.css.table+" "+e.tableClass+" tablesorter-"+e.theme,!1===a);b.hasInitialized=!1;delete b.config.cache;"function"===typeof c&&c(b)}};f.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i};f.sortNatural=function(b,a){if(b===a)return 0;var c,d,e,g,k,l;d=f.regex;if(d.hex.test(a)){c=parseInt(b.match(d.hex), 16);e=parseInt(a.match(d.hex),16);if(c<e)return-1;if(c>e)return 1}c=b.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");d=a.replace(d.chunk,"\\0$1\\0").replace(d.chunks,"").split("\\0");l=Math.max(c.length,d.length);for(k=0;k<l;k++){e=isNaN(c[k])?c[k]||0:parseFloat(c[k])||0;g=isNaN(d[k])?d[k]||0:parseFloat(d[k])||0;if(isNaN(e)!==isNaN(g))return isNaN(e)?1:-1;typeof e!==typeof g&&(e+="",g+="");if(e<g)return-1;if(e>g)return 1}return 0};f.sortNaturalAsc=function(b,a,c,d,e){if(b===a)return 0; c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:-c||-1:""===a&&0!==c?"boolean"===typeof c?c?1:-1:c||1:f.sortNatural(b,a)};f.sortNaturalDesc=function(b,a,c,d,e){if(b===a)return 0;c=e.string[e.empties[c]||e.emptyTo];return""===b&&0!==c?"boolean"===typeof c?c?-1:1:c||1:""===a&&0!==c?"boolean"===typeof c?c?1:-1:-c||-1:f.sortNatural(a,b)};f.sortText=function(b,a){return b>a?1:b<a?-1:0};f.getTextValue=function(b,a,c){if(c){var d=b?b.length:0,e=c+a;for(c=0;c<d;c++)e+= b.charCodeAt(c);return a*e}return 0};f.sortNumericAsc=function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return b-a};f.sortNumericDesc=function(b,a,c,d,e,g){if(b===a)return 0;g=g.config;e=g.string[g.empties[e]||g.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:e||1;if(""=== a&&0!==e)return"boolean"===typeof e?e?1:-1:-e||-1;isNaN(b)&&(b=f.getTextValue(b,c,d));isNaN(a)&&(a=f.getTextValue(a,c,d));return a-b};f.sortNumeric=function(b,a){return b-a};f.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119",E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6", O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};f.replaceAccents=function(b){var a,c="[",d=f.characterEquivalents;if(!f.characterRegex){f.characterRegexArray={};for(a in d)"string"===typeof a&&(c+=d[a],f.characterRegexArray[a]=RegExp("["+d[a]+"]","g"));f.characterRegex=RegExp(c+"]")}if(f.characterRegex.test(b))for(a in d)"string"===typeof a&&(b=b.replace(f.characterRegexArray[a],a));return b};f.isValueInArray=function(b, a){var c,d=a.length;for(c=0;c<d;c++)if(a[c][0]===b)return c;return-1};f.addParser=function(b){var a,c=f.parsers.length,d=!0;for(a=0;a<c;a++)f.parsers[a].id.toLowerCase()===b.id.toLowerCase()&&(d=!1);d&&f.parsers.push(b)};f.getParserById=function(b){var a,c=f.parsers.length;for(a=0;a<c;a++)if(f.parsers[a].id.toLowerCase()===b.toString().toLowerCase())return f.parsers[a];return!1};f.addWidget=function(b){f.widgets.push(b)};f.getWidgetById=function(b){var a,c,d=f.widgets.length;for(a=0;a<d;a++)if((c= f.widgets[a])&&c.hasOwnProperty("id")&&c.id.toLowerCase()===b.toLowerCase())return c};f.applyWidget=function(b,a){b=g(b)[0];var c=b.config,d=c.widgetOptions,e=[],n,k,l;!1!==a&&b.hasInitialized&&(b.isApplyingWidgets||b.isUpdating)||(c.debug&&(n=new Date),c.widgets.length&&(b.isApplyingWidgets=!0,c.widgets=g.grep(c.widgets,function(a,b){return g.inArray(a,c.widgets)===b}),g.each(c.widgets||[],function(a,b){(l=f.getWidgetById(b))&&l.id&&(l.priority||(l.priority=10),e[a]=l)}),e.sort(function(a,b){return a.priority< b.priority?-1:a.priority===b.priority?0:1}),g.each(e,function(e,f){if(f){if(a||!c.widgetInit[f.id])f.hasOwnProperty("options")&&(d=b.config.widgetOptions=g.extend(!0,{},f.options,d)),f.hasOwnProperty("init")&&f.init(b,f,c,d),c.widgetInit[f.id]=!0;!a&&f.hasOwnProperty("format")&&f.format(b,c,d,!1)}})),setTimeout(function(){b.isApplyingWidgets=!1},0),c.debug&&(k=c.widgets.length,u("Completed "+(!0===a?"initializing ":"applying ")+k+" widget"+(1!==k?"s":""),n)))};f.refreshWidgets=function(b,a,c){b=g(b)[0]; var h,e=b.config,n=e.widgets,k=f.widgets,l=k.length;for(h=0;h<l;h++)k[h]&&k[h].id&&(a||0>g.inArray(k[h].id,n))&&(e.debug&&d('Refeshing widgets: Removing "'+k[h].id+'"'),k[h].hasOwnProperty("remove")&&e.widgetInit[k[h].id]&&(k[h].remove(b,e,e.widgetOptions),e.widgetInit[k[h].id]=!1));!0!==c&&f.applyWidget(b,a)};f.getData=function(b,a,c){var d="";b=g(b);var e,f;if(!b.length)return"";e=g.metadata?b.metadata():!1;f=" "+(b.attr("class")||"");"undefined"!==typeof b.data(c)||"undefined"!==typeof b.data(c.toLowerCase())? d+=b.data(c)||b.data(c.toLowerCase()):e&&"undefined"!==typeof e[c]?d+=e[c]:a&&"undefined"!==typeof a[c]?d+=a[c]:" "!==f&&f.match(" "+c+"-")&&(d=f.match(RegExp("\\s"+c+"-([\\w-]+)"))[1]||"");return g.trim(d)};f.formatFloat=function(b,a){if("string"!==typeof b||""===b)return b;var c;b=(a&&a.config?!1!==a.config.usNumberFormat:"undefined"!==typeof a?a:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(([.\d]+)\)/,"-$1"));c=parseFloat(b);return isNaN(c)? g.trim(b):c};f.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,"")):!0}}});var p=g.tablesorter;g.fn.extend({tablesorter:p.construct});p.addParser({id:"text",is:function(){return!0},format:function(d,u){var n=u.config;d&&(d=g.trim(n.ignoreCase?d.toLocaleLowerCase():d),d=n.sortLocaleCompare?p.replaceAccents(d):d);return d},type:"text"});p.addParser({id:"digit",is:function(d){return p.isDigit(d)},format:function(d,u){var n=p.formatFloat((d||"").replace(/[^\w,. \-()]/g, ""),u);return d&&"number"===typeof n?n:d?g.trim(d&&u.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});p.addParser({id:"currency",is:function(d){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((d||"").replace(/[+\-,. ]/g,""))},format:function(d,u){var n=p.formatFloat((d||"").replace(/[^\w,. \-()]/g,""),u);return d&&"number"===typeof n?n:d?g.trim(d&&u.config.ignoreCase?d.toLocaleLowerCase():d):d},type:"numeric"});p.addParser({id:"ipAddress", is:function(d){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(d)},format:function(d,g){var n,v=d?d.split("."):"",s="",x=v.length;for(n=0;n<x;n++)s+=("00"+v[n]).slice(-3);return d?p.formatFloat(s,g):d},type:"numeric"});p.addParser({id:"url",is:function(d){return/^(https?|ftp|file):\/\//.test(d)},format:function(d){return d?g.trim(d.replace(/(https?|ftp|file):\/\//,"")):d},type:"text"});p.addParser({id:"isoDate",is:function(d){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(d)},format:function(d, g){return d?p.formatFloat(""!==d?(new Date(d.replace(/-/g,"/"))).getTime()||d:"",g):d},type:"numeric"});p.addParser({id:"percent",is:function(d){return/(\d\s*?%|%\s*?\d)/.test(d)&&15>d.length},format:function(d,g){return d?p.formatFloat(d.replace(/%/g,""),g):d},type:"numeric"});p.addParser({id:"usLongDate",is:function(d){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(d)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(d)},format:function(d,g){return d?p.formatFloat((new Date(d.replace(/(\S)([AP]M)$/i, "$1 $2"))).getTime()||d,g):d},type:"numeric"});p.addParser({id:"shortDate",is:function(d){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((d||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(d,g,n,v){if(d){n=g.config;var s=n.$headers.filter("[data-column="+v+"]:last");v=s.length&&s[0].dateFormat||p.getData(s,n.headers[v],"dateFormat")||n.dateFormat;d=d.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===v?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/, "$3/$1/$2"):"ddmmyyyy"===v?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===v&&(d=d.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"))}return d?p.formatFloat((new Date(d)).getTime()||d,g):d},type:"numeric"});p.addParser({id:"time",is:function(d){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(d)},format:function(d,g){return d?p.formatFloat((new Date("2000/01/01 "+d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||d,g):d},type:"numeric"});p.addParser({id:"metadata", is:function(){return!1},format:function(d,p,n){d=p.config;d=d.parserMetadataName?d.parserMetadataName:"sortValue";return g(n).metadata()[d]},type:"numeric"});p.addWidget({id:"zebra",priority:90,format:function(d,u,n){var v,s,x,y,C,D,E=RegExp(u.cssChildRow,"i"),B=u.$tbodies;u.debug&&(C=new Date);for(d=0;d<B.length;d++)v=B.eq(d),D=v.children("tr").length,1<D&&(x=0,v=v.children("tr:visible").not(u.selectorRemove),v.each(function(){s=g(this);E.test(this.className)||x++;y=0===x%2;s.removeClass(n.zebra[y? 1:0]).addClass(n.zebra[y?0:1])}));u.debug&&p.benchmark("Applying Zebra widget",C)},remove:function(d,p,n){var v;p=p.$tbodies;var s=(n.zebra||["even","odd"]).join(" ");for(n=0;n<p.length;n++)v=g.tablesorter.processTbody(d,p.eq(n),!0),v.children().removeClass(s),g.tablesorter.processTbody(d,v,!1)}})}(jQuery);
diff --git a/data/js/lib/jquery.tablesorter.widgets-2.14.min.js b/data/js/lib/jquery.tablesorter.widgets-2.14.min.js
deleted file mode 100644
index 1134680b4d..0000000000
--- a/data/js/lib/jquery.tablesorter.widgets-2.14.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*! tableSorter 2.8+ widgets - updated 11/19/2013 */
-;(function(l){
-var e=l.tablesorter=l.tablesorter||{};
-e.themes={bootstrap:{table:"table table-bordered table-striped",caption:"caption",header:"bootstrap-header",footerRow:"",footerCells:"",icons:"",sortNone:"bootstrap-icon-unsorted",sortAsc:"icon-chevron-up glyphicon glyphicon-chevron-up",sortDesc:"icon-chevron-down glyphicon glyphicon-chevron-down",active:"",hover:"",filterRow:"",even:"",odd:""},jui:{table:"ui-widget ui-widget-content ui-corner-all",caption:"ui-widget-content ui-corner-all",header:"ui-widget-header ui-corner-all ui-state-default", footerRow:"",footerCells:"",icons:"ui-icon",sortNone:"ui-icon-carat-2-n-s",sortAsc:"ui-icon-carat-1-n",sortDesc:"ui-icon-carat-1-s",active:"ui-state-active",hover:"ui-state-hover",filterRow:"",even:"ui-widget-content",odd:"ui-state-default"}};
-e.storage=function(b,a,c,f){b=l(b)[0];var d,g,e=!1;d={};g=b.config;var p=l(b);b=f&&f.id||p.attr(f&&f.group||"data-table-group")||b.id||l(".tablesorter").index(p);f=f&&f.url||p.attr(f&&f.page||"data-table-page")||g&&g.fixedUrl||window.location.pathname;if("localStorage"in window)try{window.localStorage.setItem("_tmptest","temp"),e=!0,window.localStorage.removeItem("_tmptest")}catch(q){}l.parseJSON&&(e?d=l.parseJSON(localStorage[a]||"{}"):(g=document.cookie.split(/[;\s|=]/),d=l.inArray(a,g)+1,d=0!==d?l.parseJSON(g[d]||"{}"):{}));if((c||""===c)&&window.JSON&&JSON.hasOwnProperty("stringify"))d[f]||(d[f]={}),d[f][b]=c,e?localStorage[a]=JSON.stringify(d):(c=new Date,c.setTime(c.getTime()+31536E6),document.cookie=a+"="+JSON.stringify(d).replace(/\"/g,'"')+"; expires="+c.toGMTString()+ "; path=/");else return d&&d[f]?d[f][b]:{}};
-e.addHeaderResizeEvent=function(b,a,c){var f;c=l.extend({},{timer:250},c);var d=b.config,e=d.widgetOptions,h=function(a){e.resize_flag=!0;f=[];d.$headers.each(function(){var a=l(this),b=a.data("savedSizes")||[0,0],c=this.offsetWidth,d=this.offsetHeight;if(c!==b[0]||d!==b[1])a.data("savedSizes",[c,d]),f.push(this)});f.length&&!1!==a&&d.$table.trigger("resize",[f]);e.resize_flag=!1};h(!1);clearInterval(e.resize_timer);if(a)return e.resize_flag=!1;e.resize_timer= setInterval(function(){e.resize_flag||h()},c.timer)};
-e.addWidget({id:"uitheme",priority:10,format:function(b,a,c){var f,d,g,h,p=e.themes,q=a.$table,m=a.$headers,k=a.theme||"jui",n=p[k]||p.jui,u=n.sortNone+" "+n.sortDesc+" "+n.sortAsc;a.debug&&(f=new Date);q.hasClass("tablesorter-"+k)&&a.theme!==k&&b.hasInitialized||(""!==n.even&&(c.zebra[0]+=" "+n.even),""!==n.odd&&(c.zebra[1]+=" "+n.odd),q.find("caption").addClass(n.caption),b=q.removeClass(""===a.theme?"":"tablesorter-"+a.theme).addClass("tablesorter-"+ k+" "+n.table).find("tfoot"),b.length&&b.find("tr").addClass(n.footerRow).children("th, td").addClass(n.footerCells),m.addClass(n.header).not(".sorter-false").bind("mouseenter.tsuitheme mouseleave.tsuitheme",function(a){l(this)["mouseenter"===a.type?"addClass":"removeClass"](n.hover)}),m.find(".tablesorter-wrapper").length||m.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>'),a.cssIcon&&m.find("."+e.css.icon).addClass(n.icons),q.hasClass("hasFilters")&& m.find(".tablesorter-filter-row").addClass(n.filterRow));l.each(m,function(){g=l(this);h=e.css.icon?g.find("."+e.css.icon):g;this.sortDisabled?(g.removeClass(u),h.removeClass(u+" tablesorter-icon "+n.icons)):(d=g.hasClass(e.css.sortAsc)?n.sortAsc:g.hasClass(e.css.sortDesc)?n.sortDesc:g.hasClass(e.css.header)?n.sortNone:"",g[d===n.sortNone?"removeClass":"addClass"](n.active),h.removeClass(u).addClass(d))});a.debug&&e.benchmark("Applying "+k+" theme",f)},remove:function(b,a,c){b=a.$table;a=a.theme|| "jui";c=e.themes[a]||e.themes.jui;var f=b.children("thead").children(),d=c.sortNone+" "+c.sortDesc+" "+c.sortAsc;b.removeClass("tablesorter-"+a+" "+c.table).find(e.css.header).removeClass(c.header);f.unbind("mouseenter.tsuitheme mouseleave.tsuitheme").removeClass(c.hover+" "+d+" "+c.active).find(".tablesorter-filter-row").removeClass(c.filterRow);f.find(".tablesorter-icon").removeClass(c.icons)}});
-e.addWidget({id:"columns",priority:30,options:{columns:["primary","secondary","tertiary"]},format:function(b, a,c){var f,d,g,h,p,q,m,k,n=a.$table,u=a.$tbodies,r=a.sortList,w=r.length,v=c&&c.columns||["primary","secondary","tertiary"],x=v.length-1;m=v.join(" ");a.debug&&(f=new Date);for(g=0;g<u.length;g++)d=e.processTbody(b,u.eq(g),!0),h=d.children("tr"),h.each(function(){p=l(this);if("none"!==this.style.display&&(q=p.children().removeClass(m),r&&r[0]&&(q.eq(r[0][0]).addClass(v[0]),1<w)))for(k=1;k<w;k++)q.eq(r[k][0]).addClass(v[k]||v[x])}),e.processTbody(b,d,!1);b=!1!==c.columns_thead?["thead tr"]:[];!1!== c.columns_tfoot&&b.push("tfoot tr");if(b.length&&(h=n.find(b.join(",")).children().removeClass(m),w))for(k=0;k<w;k++)h.filter('[data-column="'+r[k][0]+'"]').addClass(v[k]||v[x]);a.debug&&e.benchmark("Applying Columns widget",f)},remove:function(b,a,c){var f=a.$tbodies,d=(c.columns||["primary","secondary","tertiary"]).join(" ");a.$headers.removeClass(d);a.$table.children("tfoot").children("tr").children("th, td").removeClass(d);for(a=0;a<f.length;a++)c=e.processTbody(b,f.eq(a),!0),c.children("tr").each(function(){l(this).children().removeClass(d)}), e.processTbody(b,c,!1)}});
-e.addWidget({id:"filter",priority:50,options:{filter_anyMatch:!1,filter_childRows:!1,filter_columnFilters:!0,filter_cssFilter:"",filter_filteredRow:"filtered",filter_formatter:null,filter_functions:null,filter_hideFilters:!1,filter_ignoreCase:!0,filter_liveSearch:!0,filter_onlyAvail:"filter-onlyAvail",filter_reset:null,filter_saveFilters:!1,filter_searchDelay:300,filter_startsWith:!1,filter_useParsedData:!1,filter_serversideFiltering:!1,filter_defaultAttrib:"data-value"}, format:function(b,a,c){a.$table.hasClass("hasFilters")||(a.parsers||!a.parsers&&c.filter_serversideFiltering)&&e.filter.init(b,a,c)},remove:function(b,a,c){var f,d=a.$tbodies;a.$table.removeClass("hasFilters").unbind("addRows updateCell update updateComplete appendCache search filterStart filterEnd ".split(" ").join(".tsfilter ")).find(".tablesorter-filter-row").remove();for(a=0;a<d.length;a++)f=e.processTbody(b,d.eq(a),!0),f.children().removeClass(c.filter_filteredRow).show(),e.processTbody(b,f, !1);c.filter_reset&&l(document).undelegate(c.filter_reset,"click.tsfilter")}});
-e.filter={regex:{regex:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/,child:/tablesorter-childRow/,filtered:/filtered/,type:/undefined|number/,exact:/(^[\"|\'|=]+)|([\"|\'|=]+$)/g,nondigit:/[^\w,. \-()]/g,operators:/[<>=]/g},types:{regex:function(b,a,c,f){if(e.filter.regex.regex.test(a)){var d;b=e.filter.regex.regex.exec(a);try{d=RegExp(b[1],b[2]).test(f)}catch(g){d=!1}return d}return null},exact:function(b,a,c,f){return a.replace(e.filter.regex.exact, "")==f?!0:null},notMatch:function(b,a,c,f,d,e,h,p){return/^\!/.test(a)?(a=a.replace("!",""),b=f.search(l.trim(a)),""===a?!0:!(p.filter_startsWith?0===b:0<=b)):null},operators:function(b,a,c,f,d,g,h,l,q){if(/^[<>]=?/.test(a)){var m,k;m=h.config;b=e.formatFloat(a.replace(e.filter.regex.operators,""),h);c=m.parsers[g];l=b;if(q[g]||"numeric"===c.type)m=c.format(""+a.replace(e.filter.regex.operators,""),h,m.$headers.eq(g),g),b="number"!==typeof b||""===m||isNaN(m)?b:m;m=!q[g]&&"numeric"!==c.type||isNaN(b)|| !d?isNaN(f)?e.formatFloat(f.replace(e.filter.regex.nondigit,""),h):e.formatFloat(f,h):d;/>/.test(a)&&(k=/>=/.test(a)?m>=b:m>b);/</.test(a)&&(k=/<=/.test(a)?m<=b:m<b);k||""!==l||(k=!0);return k}return null},and:function(b,a,c,f){if(/\s+(AND|&&)\s+/g.test(b)){b=a.split(/(?:\s+(?:and|&&)\s+)/g);a=0<=f.search(l.trim(b[0]));for(c=b.length-1;a&&c;)a=a&&0<=f.search(l.trim(b[c])),c--;return a}return null},range:function(b,a,c,f,d,g,h,l,q){if(/\s+(-|to)\s+/.test(a)){b=h.config;c=a.split(/(?: - | to )/);l= e.formatFloat(c[0].replace(e.filter.regex.nondigit,""),h);var m=e.formatFloat(c[1].replace(e.filter.regex.nondigit,""),h);if(q[g]||"numeric"===b.parsers[g].type)a=b.parsers[g].format(""+c[0],h,b.$headers.eq(g),g),l=""===a||isNaN(a)?l:a,a=b.parsers[g].format(""+c[1],h,b.$headers.eq(g),g),m=""===a||isNaN(a)?m:a;a=!q[g]&&"numeric"!==b.parsers[g].type||isNaN(l)||isNaN(m)?isNaN(f)?e.formatFloat(f.replace(e.filter.regex.nondigit,""),h):e.formatFloat(f,h):d;l>m&&(a=l,l=m,m=a);return a>=l&&a<=m||""===l|| ""===m}return null},wild:function(b,a,c,f,d,e,h){return/[\?|\*]/.test(a)||/\s+OR\s+/.test(b)?(b=h.config,a=a.replace(/\s+OR\s+/gi,"|"),!b.$headers.filter('[data-column="'+e+'"]:last').hasClass("filter-match")&&/\|/.test(a)&&(a="^("+a+")$"),RegExp(a.replace(/\?/g,"\\S{1}").replace(/\*/g,"\\S*")).test(f)):null},fuzzy:function(b,a,c,f){if(/^~/.test(a)){b=0;c=f.length;var d=a.slice(1);for(a=0;a<c;a++)f[a]===d[b]&&(b+=1);return b===d.length?!0:!1}return null}},init:function(b,a,c){var f,d,g,h,p,q;a.debug&& (q=new Date);a.$table.addClass("hasFilters");e.filter.regex.child=RegExp(a.cssChildRow);e.filter.regex.filtered=RegExp(c.filter_filteredRow);!1!==c.filter_columnFilters&&a.$headers.filter(".filter-false").length!==a.$headers.length&&e.filter.buildRow(b,a,c);a.$table.bind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(".tsfilter "),function(c,d){/(search|filterReset|filterEnd)/.test(c.type)||(c.stopPropagation(),e.filter.buildDefault(b, !0));"filterReset"===c.type&&e.filter.searching(b,[]);"filterEnd"===c.type?e.filter.buildDefault(b,!0):(d="search"===c.type?d:"updateComplete"===c.type?a.$table.data("lastSearch"):"",e.filter.searching(b,d));return!1});e.filter.bindSearch(b,a.$table.find("input.tablesorter-filter"));c.filter_reset&&l(document).delegate(c.filter_reset,"click.tsfilter",function(){a.$table.trigger("filterReset")});if(c.filter_functions)for(h in c.filter_functions)if(c.filter_functions.hasOwnProperty(h)&&"string"===typeof h)if(g= a.$headers.filter('[data-column="'+h+'"]:last'),f="",!0===c.filter_functions[h]&&!g.hasClass("filter-false"))e.filter.buildSelect(b,h);else if("string"===typeof h&&!g.hasClass("filter-false")){for(d in c.filter_functions[h])"string"===typeof d&&(f+=""===f?'<option value="">'+(g.data("placeholder")||g.attr("data-placeholder")||"")+"</option>":"",f+='<option value="'+d+'">'+d+"</option>");a.$table.find("thead").find('select.tablesorter-filter[data-column="'+h+'"]').append(f)}e.filter.buildDefault(b, !0);a.$table.find("select.tablesorter-filter").bind("change search",function(a,c){e.filter.checkFilters(b,c)});c.filter_hideFilters&&e.filter.hideFilters(b,a,c);a.showProcessing&&a.$table.bind("filterStart.tsfilter filterEnd.tsfilter",function(c,d){g=d?a.$table.find("."+e.css.header).filter("[data-column]").filter(function(){return""!==d[l(this).data("column")]}):"";e.isProcessing(b,"filterStart"===c.type,d?g:"")});a.debug&&e.benchmark("Applying Filter widget",q);a.$table.bind("tablesorter-initialized pagerInitialized", function(){p=e.filter.setDefaults(b,a,c)||[];p.length&&e.setFilters(b,p,!0);e.filter.checkFilters(b,p)});c.filter_Initialized=!0;a.$table.trigger("filterInit")},setDefaults:function(b,a,c){var f,d=[],g=a.columns;c.filter_saveFilters&&e.storage&&(d=e.storage(b,"tablesorter-filters")||[],""===d.join("")&&(d=[]));if(!d.length)for(f=0;f<g;f++)d[f]=a.$headers.filter('[data-column="'+f+'"]:last').attr(c.filter_defaultAttrib)||d[f];l(b).data("lastSearch",d);return d},buildRow:function(b,a,c){var f,d,g,h= a.columns;d='<tr class="tablesorter-filter-row">';for(b=0;b<h;b++)d+="<td></td>";a.$filters=l(d+"</tr>").appendTo(a.$table.find("thead").eq(0)).find("td");for(b=0;b<h;b++)f=a.$headers.filter('[data-column="'+b+'"]:last'),d=c.filter_functions&&c.filter_functions[b]&&"function"!==typeof c.filter_functions[b]||f.hasClass("filter-select"),g=e.getData?"false"===e.getData(f[0],a.headers[b],"filter"):a.headers[b]&&a.headers[b].hasOwnProperty("filter")&&!1===a.headers[b].filter||f.hasClass("filter-false"), d?d=l("<select>").appendTo(a.$filters.eq(b)):(c.filter_formatter&&l.isFunction(c.filter_formatter[b])?((d=c.filter_formatter[b](a.$filters.eq(b),b))&&0===d.length&&(d=a.$filters.eq(b).children("input")),d&&(0===d.parent().length||d.parent().length&&d.parent()[0]!==a.$filters[b])&&a.$filters.eq(b).append(d)):d=l('<input type="search">').appendTo(a.$filters.eq(b)),d&&d.attr("placeholder",f.data("placeholder")||f.attr("data-placeholder")||"")),d&&(d.addClass("tablesorter-filter "+c.filter_cssFilter).attr("data-column", b),g&&(d.addClass("disabled")[0].disabled=!0))},bindSearch:function(b,a){b=l(b)[0];var c,f=b.config.widgetOptions;a.unbind("keyup search").bind("keyup search",function(d,g){if(27===d.which)this.value="";else if("number"===typeof f.filter_liveSearch&&this.value.length<f.filter_liveSearch&&""!==this.value||"keyup"===d.type&&(32>d.which&&8!==d.which&&!0===f.filter_liveSearch&&13!==d.which||37<=d.which&&40>=d.which||13!==d.which&&!1===f.filter_liveSearch))return;l(this).hasClass("tablesorter-filter")? c=g:(c=[],a.each(function(){c[l(this).data("column")||0]=l(this).val()}));e.filter.searching(b,g,c)})},checkFilters:function(b,a){var c=b.config,f=c.widgetOptions,d=l.isArray(a),g=d?a:e.getFilters(b),h=(g||[]).join("");d&&e.setFilters(b,g);f.filter_hideFilters&&c.$table.find(".tablesorter-filter-row").trigger(""===h?"mouseleave":"mouseenter");if(c.lastCombinedFilter!==h||!1===a)if(c.$table.trigger("filterStart",[g]),c.showProcessing)setTimeout(function(){e.filter.findRows(b,g,h);return!1},30);else return e.filter.findRows(b, g,h),!1},hideFilters:function(b,a,c){var f,d,g;a.$table.find(".tablesorter-filter-row").addClass("hideme").bind("mouseenter mouseleave",function(a){f=l(this);clearTimeout(g);g=setTimeout(function(){/enter|over/.test(a.type)?f.removeClass("hideme"):l(document.activeElement).closest("tr")[0]!==f[0]&&""===e.getFilters(b).join("")&&f.addClass("hideme")},200)}).find("input, select").bind("focus blur",function(a){d=l(this).closest("tr");clearTimeout(g);g=setTimeout(function(){if(""===e.getFilters(b).join(""))d["focus"=== a.type?"removeClass":"addClass"]("hideme")},200)})},findRows:function(b,a,c){var f,d,g,h,p,q,m,k,n,u,r,w,v,x,A,z,B,C,y,E,t=b.config,s=t.widgetOptions,G=t.columns,D=t.$tbodies,H=["range","notMatch","operators"],F=t.$headers.map(function(a){return e.getData?"parsed"===e.getData(t.$headers.filter('[data-column="'+a+'"]:last'),t.headers[a],"filter"):l(this).hasClass("filter-parsed")}).get();t.debug&&(E=new Date);for(p=0;p<D.length;p++)if(!D.eq(p).hasClass(e.css.info)){q=e.processTbody(b,D.eq(p),!0);g= q.children("tr").not("."+t.cssChildRow).not(".group-header");d=g.length;if(""===c||s.filter_serversideFiltering)q.children().show().removeClass(s.filter_filteredRow);else for(B=!0,x=t.lastSearch||t.$table.data("lastSearch")||[],l.each(a,function(a,b){B=0===(b||"").indexOf(x[a]||"")&&B&&!/(\s+or\s+|\|)/g.test(b||"")}),B&&0===g.filter(":visible").length&&(B=!1),h=0;h<d;h++)if(n=g[h].className,!(e.filter.regex.child.test(n)||B&&e.filter.regex.filtered.test(n))){y=!0;n=g.eq(h).nextUntil("tr:not(."+t.cssChildRow+ ")");u=n.length&&s.filter_childRows?n.text():"";u=s.filter_ignoreCase?u.toLocaleLowerCase():u;m=g.eq(h).children("td");for(k=0;k<G;k++)if(a[k]||s.filter_anyMatch){f=t.cache[p].normalized[h][k];s.filter_useParsedData||F[k]?r=f:(r=l.trim(m.eq(k).text()),r=t.sortLocaleCompare?e.replaceAccents(r):r);w=!e.filter.regex.type.test(typeof r)&&s.filter_ignoreCase?r.toLocaleLowerCase():r;z=y;if("undefined"===typeof a[k]||null===a[k])a[k]=s.filter_anyMatch?c:a[k];a[k]=t.sortLocaleCompare?e.replaceAccents(a[k]): a[k];v=s.filter_ignoreCase?a[k].toLocaleLowerCase():a[k];s.filter_functions&&s.filter_functions[k]?!0===s.filter_functions[k]?z=t.$headers.filter('[data-column="'+k+'"]:last').hasClass("filter-match")?0<=w.search(v):a[k]===r:"function"===typeof s.filter_functions[k]?z=s.filter_functions[k](r,f,a[k],k,g.eq(h)):"function"===typeof s.filter_functions[k][a[k]]&&(z=s.filter_functions[k][a[k]](r,f,a[k],k,g.eq(h))):(C=null,l.each(e.filter.types,function(c,d){if(!s.filter_anyMatch||s.filter_anyMatch&&0>H.indexOf(c))if(A= d(a[k],v,r,w,f,k,b,s,F),null!==A)return C=A,!1}),null!==C?z=C:(r=(w+u).indexOf(v),z=!s.filter_startsWith&&0<=r||s.filter_startsWith&&0===r));if(s.filter_anyMatch){if(y=z)break}else y=z?y:!1}g[h].style.display=y?"":"none";g.eq(h)[y?"removeClass":"addClass"](s.filter_filteredRow);if(n.length){if(t.pager&&t.pager.countChildRows||s.pager_countChildRows)n[y?"removeClass":"addClass"](s.filter_filteredRow);n.toggle(y)}}e.processTbody(b,q,!1)}t.lastCombinedFilter=c;t.lastSearch=a;t.$table.data("lastSearch", a);s.filter_saveFilters&&e.storage&&e.storage(b,"tablesorter-filters",a);t.debug&&e.benchmark("Completed filter widget search",E);t.$table.trigger("applyWidgets");t.$table.trigger("filterEnd")},buildSelect:function(b,a,c,f){a=parseInt(a,10);var d,g,h;b=b.config;var p=b.widgetOptions,q=b.$tbodies,m=[],k=b.$headers.filter('[data-column="'+a+'"]:last'),n='<option value="">'+(k.data("placeholder")||k.attr("data-placeholder")||"")+"</option>";for(g=0;g<q.length;g++)for(h=b.cache[g].row.length,d=0;d<h;d++)f&& b.cache[g].row[d][0].className.match(p.filter_filteredRow)||(p.filter_useParsedData?m.push(""+b.cache[g].normalized[d][a]):(k=b.cache[g].row[d][0].cells[a])&&m.push(l.trim(k.textContent||k.innerText||l(k).text())));m=l.grep(m,function(a,b){return l.inArray(a,m)===b});m=e.sortNatural?m.sort(function(a,b){return e.sortNatural(a,b)}):m.sort(!0);d=b.$table.find("thead").find('select.tablesorter-filter[data-column="'+a+'"]').val();for(f=0;f<m.length;f++)g=m[f].replace(/\"/g,"&quot;"),n+=""!==m[f]?'<option value="'+ g+'"'+(d===g?' selected="selected"':"")+">"+m[f]+"</option>":"";b.$table.find("thead").find('select.tablesorter-filter[data-column="'+a+'"]')[c?"html":"append"](n)},buildDefault:function(b,a){var c,f,d=b.config,g=d.widgetOptions,h=d.columns;for(c=0;c<h;c++)f=d.$headers.filter('[data-column="'+c+'"]:last'),(f.hasClass("filter-select")||g.filter_functions&&!0===g.filter_functions[c])&&!f.hasClass("filter-false")&&(g.filter_functions||(g.filter_functions={}),g.filter_functions[c]=!0,e.filter.buildSelect(b, c,a,f.hasClass(g.filter_onlyAvail)))},searching:function(b,a,c){if("undefined"===typeof a||!0===a||c){var f=b.config.widgetOptions;clearTimeout(f.searchTimer);f.searchTimer=setTimeout(function(){e.filter.checkFilters(b,c||a)},f.filter_liveSearch?f.filter_searchDelay:10)}else e.filter.checkFilters(b,a)}};
-e.getFilters=function(b){var a=b?l(b)[0].config:{};return a&&a.widgetOptions&&!a.widgetOptions.filter_columnFilters?l(b).data("lastSearch"):a&&a.$filters?a.$filters.map(function(a,b){return l(b).find(".tablesorter-filter").val()|| ""}).get()||[]:!1};
-e.setFilters=function(b,a,c){b=l(b);var e=b.length?b[0].config:{},e=e&&e.$filters?e.$filters.each(function(b,c){l(c).find(".tablesorter-filter").val(a[b]||"")}).trigger("change.tsfilter")||!1:!1;c&&b.trigger("search",[a,!1]);return!!e};
-e.addWidget({id:"stickyHeaders",priority:60,options:{stickyHeaders:"",stickyHeaders_offset:0,stickyHeaders_cloneId:"-sticky",stickyHeaders_addResizeEvent:!0,stickyHeaders_includeCaption:!0,stickyHeaders_zIndex:2},format:function(b,a,c){if(!a.$table.hasClass("hasStickyHeaders")){var f, d=a.$table,g=l(window),h=d.children("thead:first"),p=h.children("tr").not(".sticky-false").children(),q=d.find("tfoot"),m=isNaN(c.stickyHeaders_offset)?l(c.stickyHeaders_offset):"",k=m.length?m.height()||0:parseInt(c.stickyHeaders_offset,10)||0,n=c.$sticky=d.clone().addClass("containsStickyHeaders").css({position:"fixed",margin:0,top:k,visibility:"hidden",zIndex:c.stickyHeaders_zIndex?c.stickyHeaders_zIndex:2}),u=n.children("thead:first").addClass("tablesorter-stickyHeader "+c.stickyHeaders),r,w= "",v=0,x=!1,A=function(){k=m.length?m.height()||0:parseInt(c.stickyHeaders_offset,10)||0;v=0;"collapse"===d.css("border-collapse")||/(webkit|msie)/i.test(navigator.userAgent)||(v=2*parseInt(p.eq(0).css("border-left-width"),10));n.css({left:h.offset().left-g.scrollLeft()-v,width:d.width()});r.filter(":visible").each(function(a){a=p.filter(":visible").eq(a);l(this).css({width:a.width()-v,height:a.height()}).find(".tablesorter-header-inner").width(a.find(".tablesorter-header-inner").width())})};n.attr("id")&& (n[0].id+=c.stickyHeaders_cloneId);n.find("thead:gt(0), tr.sticky-false, tbody, tfoot").remove();c.stickyHeaders_includeCaption||n.find("caption").remove();r=u.children().children();n.css({height:0,width:0,padding:0,margin:0,border:0});r.find(".tablesorter-resizer").remove();d.addClass("hasStickyHeaders").bind("sortEnd.tsSticky",function(){p.filter(":visible").each(function(b){f=r.filter(":visible").eq(b).attr("class",l(this).attr("class")).removeClass(e.css.processing+" "+a.cssProcessing);a.cssIcon&& f.find("."+e.css.icon).attr("class",l(this).find("."+e.css.icon).attr("class"))})}).bind("pagerComplete.tsSticky",function(){A()});p.find(a.selectorSort).add(a.$headers.filter(a.selectorSort)).each(function(b){var c=l(this);b=u.children("tr.tablesorter-headerRow").children().eq(b).bind("mouseup",function(a){c.trigger(a,!0)});a.cancelSelection&&b.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})});d.after(n);g.bind("scroll.tsSticky resize.tsSticky",function(a){if(d.is(":visible")){var b= d.offset(),e=c.stickyHeaders_includeCaption?0:d.find("caption").outerHeight(!0),e=g.scrollTop()+k-e,f=d.height()-(n.height()+(q.height()||0)),b=e>b.top&&e<b.top+f?"visible":"hidden";n.removeClass("tablesorter-sticky-visible tablesorter-sticky-hidden").addClass("tablesorter-sticky-"+b).css({left:h.offset().left-g.scrollLeft()-v,visibility:b});if(b!==w||"resize"===a.type)A(),w=b}});c.stickyHeaders_addResizeEvent&&e.addHeaderResizeEvent(b);d.bind("filterEnd",function(){x||u.find(".tablesorter-filter-row").children().each(function(b){l(this).find(".tablesorter-filter").val(a.$filters.find(".tablesorter-filter").eq(b).val())})}); r.find(".tablesorter-filter").bind("keyup search change",function(b){if(!(32>b.which&&8!==b.which||37<=b.which&&40>=b.which)){x=!0;b=l(this);var d=b.attr("data-column");a.$filters.find(".tablesorter-filter").eq(d).val(b.val()).trigger("search");setTimeout(function(){x=!1},c.filter_searchDelay)}});d.trigger("stickyHeadersInit")}},remove:function(b,a,c){a.$table.removeClass("hasStickyHeaders").unbind("sortEnd.tsSticky pagerComplete.tsSticky").find(".tablesorter-stickyHeader").remove();c.$sticky&&c.$sticky.length&& c.$sticky.remove();l(".hasStickyHeaders").length||l(window).unbind("scroll.tsSticky resize.tsSticky");e.addHeaderResizeEvent(b,!1)}});
-e.addWidget({id:"resizable",priority:40,options:{resizable:!0,resizable_addLastColumn:!1},format:function(b,a,c){if(!a.$table.hasClass("hasResizable")){a.$table.addClass("hasResizable");var f,d,g,h,p={},q=a.$table,m=0,k=null,n=null,u=20>Math.abs(q.parent().width()-q.width()),r=function(){e.storage&&k&&(p[k.index()]=k.width(),p[n.index()]=n.width(),k.width(p[k.index()]), n.width(p[n.index()]),!1!==c.resizable&&e.storage(b,"tablesorter-resizable",p));m=0;k=n=null;l(window).trigger("resize")};if(p=e.storage&&!1!==c.resizable?e.storage(b,"tablesorter-resizable"):{})for(h in p)!isNaN(h)&&h<a.$headers.length&&a.$headers.eq(h).width(p[h]);f=q.children("thead:first").children("tr");f.children().each(function(){var b;b=l(this);h=b.attr("data-column");b="false"===e.getData(b,a.headers[h],"resizable");f.children().filter('[data-column="'+h+'"]')[b?"addClass":"removeClass"]("resizable-false")}); f.each(function(){g=l(this).children().not(".resizable-false");l(this).find(".tablesorter-wrapper").length||g.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>');c.resizable_addLastColumn||(g=g.slice(0,-1));d=d?d.add(g):g});d.each(function(){var a=l(this),b=parseInt(a.css("padding-right"),10)+10;a.find(".tablesorter-wrapper").append('<div class="tablesorter-resizer" style="cursor:w-resize;position:absolute;z-index:1;right:-'+b+'px;top:0;height:100%;width:20px;"></div>')}).bind("mousemove.tsresize", function(a){if(0!==m&&k){var b=a.pageX-m,c=k.width();k.width(c+b);k.width()!==c&&u&&n.width(n.width()-b);m=a.pageX}}).bind("mouseup.tsresize",function(){r()}).find(".tablesorter-resizer,.tablesorter-resizer-grip").bind("mousedown",function(b){k=l(b.target).closest("th");var c=a.$headers.filter('[data-column="'+k.attr("data-column")+'"]');1<c.length&&(k=k.add(c));n=b.shiftKey?k.parent().find("th").not(".resizable-false").filter(":last"):k.nextAll(":not(.resizable-false)").eq(0);m=b.pageX});q.find("thead:first").bind("mouseup.tsresize mouseleave.tsresize", function(){r()}).bind("contextmenu.tsresize",function(){e.resizableReset(b);var a=l.isEmptyObject?l.isEmptyObject(p):!0;p={};return a})}},remove:function(b,a){a.$table.removeClass("hasResizable").children("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").children("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find(".tablesorter-resizer,.tablesorter-resizer-grip").remove();e.resizableReset(b)}});
-e.resizableReset=function(b){b.config.$headers.not(".resizable-false").css("width", "");e.storage&&e.storage(b,"tablesorter-resizable",{})};
-e.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(b,a,c,e){a.format(b,c,e,!0)},format:function(b,a,c,f){var d,g=a.$table;c=!1!==c.saveSort;var h={sortList:a.sortList};a.debug&&(d=new Date);g.hasClass("hasSaveSort")?c&&b.hasInitialized&&e.storage&&(e.storage(b,"tablesorter-savesort",h),a.debug&&e.benchmark("saveSort widget: Saving last sort: "+a.sortList,d)):(g.addClass("hasSaveSort"),h="",e.storage&&(h=(c=e.storage(b, "tablesorter-savesort"))&&c.hasOwnProperty("sortList")&&l.isArray(c.sortList)?c.sortList:"",a.debug&&e.benchmark('saveSort: Last sort loaded: "'+h+'"',d),g.bind("saveSortReset",function(a){a.stopPropagation();e.storage(b,"tablesorter-savesort","")})),f&&h&&0<h.length?a.sortList=h:b.hasInitialized&&h&&0<h.length&&g.trigger("sorton",[h]))},remove:function(b){e.storage&&e.storage(b,"tablesorter-savesort","")}})
-})(jQuery);
diff --git a/data/js/lib/jquery.tablesorter.widgets-2.16.3.min.js b/data/js/lib/jquery.tablesorter.widgets-2.16.3.min.js
new file mode 100644
index 0000000000..10c24c0e08
--- /dev/null
+++ b/data/js/lib/jquery.tablesorter.widgets-2.16.3.min.js
@@ -0,0 +1,17 @@
+/*! tableSorter 2.16+ widgets - updated 4/30/2014 (v2.16.3) */
+;(function(k){
+var d=k.tablesorter=k.tablesorter||{};
+d.themes={bootstrap:{table:"table table-bordered table-striped",caption:"caption",header:"bootstrap-header",footerRow:"",footerCells:"",icons:"",sortNone:"bootstrap-icon-unsorted",sortAsc:"icon-chevron-up glyphicon glyphicon-chevron-up",sortDesc:"icon-chevron-down glyphicon glyphicon-chevron-down",active:"",hover:"",filterRow:"",even:"",odd:""},jui:{table:"ui-widget ui-widget-content ui-corner-all",caption:"ui-widget-content ui-corner-all",header:"ui-widget-header ui-corner-all ui-state-default", footerRow:"",footerCells:"",icons:"ui-icon",sortNone:"ui-icon-carat-2-n-s",sortAsc:"ui-icon-carat-1-n",sortDesc:"ui-icon-carat-1-s",active:"ui-state-active",hover:"ui-state-hover",filterRow:"",even:"ui-widget-content",odd:"ui-state-default"}};k.extend(d.css,{filterRow:"tablesorter-filter-row",filter:"tablesorter-filter",wrapper:"tablesorter-wrapper",resizer:"tablesorter-resizer",grip:"tablesorter-resizer-grip",sticky:"tablesorter-stickyHeader",stickyVis:"tablesorter-sticky-visible"});
+d.storage=function(b, a,c,e){b=k(b)[0];var f,d,g=!1;f={};d=b.config;var l=k(b);b=e&&e.id||l.attr(e&&e.group||"data-table-group")||b.id||k(".tablesorter").index(l);e=e&&e.url||l.attr(e&&e.page||"data-table-page")||d&&d.fixedUrl||window.location.pathname;if("localStorage"in window)try{window.localStorage.setItem("_tmptest","temp"),g=!0,window.localStorage.removeItem("_tmptest")}catch(n){}k.parseJSON&&(g?f=k.parseJSON(localStorage[a]||"{}"):(d=document.cookie.split(/[;\s|=]/),f=k.inArray(a,d)+1,f=0!==f?k.parseJSON(d[f]|| "{}"):{}));if((c||""===c)&&window.JSON&&JSON.hasOwnProperty("stringify"))f[e]||(f[e]={}),f[e][b]=c,g?localStorage[a]=JSON.stringify(f):(c=new Date,c.setTime(c.getTime()+31536E6),document.cookie=a+"="+JSON.stringify(f).replace(/\"/g,'"')+"; expires="+c.toGMTString()+"; path=/");else return f&&f[e]?f[e][b]:""};
+d.addHeaderResizeEvent=function(b,a,c){var e;c=k.extend({},{timer:250},c);var d=b.config,h=d.widgetOptions,g=function(a){h.resize_flag=!0;e=[];d.$headers.each(function(){var a=k(this),b=a.data("savedSizes")|| [0,0],c=this.offsetWidth,d=this.offsetHeight;if(c!==b[0]||d!==b[1])a.data("savedSizes",[c,d]),e.push(this)});e.length&&!1!==a&&d.$table.trigger("resize",[e]);h.resize_flag=!1};g(!1);clearInterval(h.resize_timer);if(a)return h.resize_flag=!1;h.resize_timer=setInterval(function(){h.resize_flag||g()},c.timer)};
+d.addWidget({id:"uitheme",priority:10,format:function(b,a,c){var e,f,h,g=d.themes;e=a.$table;h=a.$headers;var l=a.theme||"jui",n=g[l]||g.jui,g=n.sortNone+" "+n.sortDesc+" "+n.sortAsc;a.debug&& (f=new Date);e.hasClass("tablesorter-"+l)&&a.theme!==l&&b.hasInitialized||(""!==n.even&&(c.zebra[0]+=" "+n.even),""!==n.odd&&(c.zebra[1]+=" "+n.odd),e.find("caption").addClass(n.caption),b=e.removeClass(""===a.theme?"":"tablesorter-"+a.theme).addClass("tablesorter-"+l+" "+n.table).find("tfoot"),b.length&&b.find("tr").addClass(n.footerRow).children("th, td").addClass(n.footerCells),h.addClass(n.header).not(".sorter-false").bind("mouseenter.tsuitheme mouseleave.tsuitheme",function(a){k(this)["mouseenter"=== a.type?"addClass":"removeClass"](n.hover)}),h.find("."+d.css.wrapper).length||h.wrapInner('<div class="'+d.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>'),a.cssIcon&&h.find("."+d.css.icon).addClass(n.icons),e.hasClass("hasFilters")&&h.find("."+d.css.filterRow).addClass(n.filterRow));for(e=0;e<a.columns;e++)b=a.$headers.add(a.$extraHeaders).filter('[data-column="'+e+'"]'),c=d.css.icon?b.find("."+d.css.icon):b,a.$headers.filter('[data-column="'+e+'"]:last')[0].sortDisabled? (b.removeClass(g),c.removeClass(g+" "+n.icons)):(h=b.hasClass(d.css.sortAsc)?n.sortAsc:b.hasClass(d.css.sortDesc)?n.sortDesc:b.hasClass(d.css.header)?n.sortNone:"",b[h===n.sortNone?"removeClass":"addClass"](n.active),c.removeClass(g).addClass(h));a.debug&&d.benchmark("Applying "+l+" theme",f)},remove:function(b,a,c){b=a.$table;a=a.theme||"jui";c=d.themes[a]||d.themes.jui;var e=b.children("thead").children(),f=c.sortNone+" "+c.sortDesc+" "+c.sortAsc;b.removeClass("tablesorter-"+a+" "+c.table).find(d.css.header).removeClass(c.header); e.unbind("mouseenter.tsuitheme mouseleave.tsuitheme").removeClass(c.hover+" "+f+" "+c.active).find("."+d.css.filterRow).removeClass(c.filterRow);e.find("."+d.css.icon).removeClass(c.icons)}});
+d.addWidget({id:"columns",priority:30,options:{columns:["primary","secondary","tertiary"]},format:function(b,a,c){var e,f,h,g,l,n,p,m,u=a.$table,t=a.$tbodies,s=a.sortList,w=s.length,v=c&&c.columns||["primary","secondary","tertiary"],x=v.length-1;p=v.join(" ");a.debug&&(e=new Date);for(h=0;h<t.length;h++)f=d.processTbody(b, t.eq(h),!0),g=f.children("tr"),g.each(function(){l=k(this);if("none"!==this.style.display&&(n=l.children().removeClass(p),s&&s[0]&&(n.eq(s[0][0]).addClass(v[0]),1<w)))for(m=1;m<w;m++)n.eq(s[m][0]).addClass(v[m]||v[x])}),d.processTbody(b,f,!1);b=!1!==c.columns_thead?["thead tr"]:[];!1!==c.columns_tfoot&&b.push("tfoot tr");if(b.length&&(g=u.find(b.join(",")).children().removeClass(p),w))for(m=0;m<w;m++)g.filter('[data-column="'+s[m][0]+'"]').addClass(v[m]||v[x]);a.debug&&d.benchmark("Applying Columns widget", e)},remove:function(b,a,c){var e=a.$tbodies,f=(c.columns||["primary","secondary","tertiary"]).join(" ");a.$headers.removeClass(f);a.$table.children("tfoot").children("tr").children("th, td").removeClass(f);for(a=0;a<e.length;a++)c=d.processTbody(b,e.eq(a),!0),c.children("tr").each(function(){k(this).children().removeClass(f)}),d.processTbody(b,c,!1)}});
+d.addWidget({id:"filter",priority:50,options:{filter_childRows:!1,filter_columnFilters:!0,filter_cssFilter:"",filter_external:"",filter_filteredRow:"filtered", filter_formatter:null,filter_functions:null,filter_hideEmpty:!0,filter_hideFilters:!1,filter_ignoreCase:!0,filter_liveSearch:!0,filter_onlyAvail:"filter-onlyAvail",filter_placeholder:{search:"",select:""},filter_reset:null,filter_saveFilters:!1,filter_searchDelay:300,filter_selectSource:null,filter_startsWith:!1,filter_useParsedData:!1,filter_serversideFiltering:!1,filter_defaultAttrib:"data-value"},format:function(b,a,c){a.$table.hasClass("hasFilters")||d.filter.init(b,a,c)},remove:function(b,a, c){var e,f=a.$tbodies;a.$table.removeClass("hasFilters").unbind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter ")).find("."+d.css.filterRow).remove();for(a=0;a<f.length;a++)e=d.processTbody(b,f.eq(a),!0),e.children().removeClass(c.filter_filteredRow).show(),d.processTbody(b,e,!1);c.filter_reset&&k(document).undelegate(c.filter_reset,"click.tsfilter")}});
+d.filter={regex:{regex:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, child:/tablesorter-childRow/,filtered:/filtered/,type:/undefined|number/,exact:/(^[\"|\'|=]+)|([\"|\'|=]+$)/g,nondigit:/[^\w,. \-()]/g,operators:/[<>=]/g},types:{regex:function(b,a,c,e){if(d.filter.regex.regex.test(a)){var f;b=d.filter.regex.regex.exec(a);try{f=RegExp(b[1],b[2]).test(e)}catch(h){f=!1}return f}return null},operators:function(b,a,c,e,f,h,g,l,k){if(/^[<>]=?/.test(a)){var p,m;p=g.config;b=d.formatFloat(a.replace(d.filter.regex.operators,""),g);c=p.parsers[h];l=b;if(k[h]||"numeric"=== c.type)p=c.format(""+a.replace(d.filter.regex.operators,""),g,p.$headers.eq(h),h),b="number"!==typeof b||""===p||isNaN(p)?b:p;p=!k[h]&&"numeric"!==c.type||isNaN(b)||!f?isNaN(e)?d.formatFloat(e.replace(d.filter.regex.nondigit,""),g):d.formatFloat(e,g):f;/>/.test(a)&&(m=/>=/.test(a)?p>=b:p>b);/</.test(a)&&(m=/<=/.test(a)?p<=b:p<b);m||""!==l||(m=!0);return m}return null},exact:function(b,a,c,e,f,h,g,l,n,p){return d.filter.regex.exact.test(a)?(b=a.replace(d.filter.regex.exact,""),p?0<=k.inArray(b,p): b==e):null},notMatch:function(b,a,c,e,d,h,g,l){return/^\!/.test(a)?(a=a.replace("!",""),b=e.search(k.trim(a)),""===a?!0:!(l.filter_startsWith?0===b:0<=b)):null},and:function(b,a,c,e){if(/\s+(AND|&&)\s+/g.test(b)){b=a.split(/(?:\s+(?:and|&&)\s+)/g);a=0<=e.search(k.trim(b[0]));for(c=b.length-1;a&&c;)a=a&&0<=e.search(k.trim(b[c])),c--;return a}return null},range:function(b,a,c,e,f,h,g,k,n){if(/\s+(-|to)\s+/.test(a)){b=g.config;var p=a.split(/(?: - | to )/);c=d.formatFloat(p[0].replace(d.filter.regex.nondigit, ""),g);k=d.formatFloat(p[1].replace(d.filter.regex.nondigit,""),g);if(n[h]||"numeric"===b.parsers[h].type)a=b.parsers[h].format(""+p[0],g,b.$headers.eq(h),h),c=""===a||isNaN(a)?c:a,a=b.parsers[h].format(""+p[1],g,b.$headers.eq(h),h),k=""===a||isNaN(a)?k:a;a=!n[h]&&"numeric"!==b.parsers[h].type||isNaN(c)||isNaN(k)?isNaN(e)?d.formatFloat(e.replace(d.filter.regex.nondigit,""),g):d.formatFloat(e,g):f;c>k&&(e=c,c=k,k=e);return a>=c&&a<=k||""===c||""===k}return null},wild:function(b,a,c,e,d,h,g,l,n,p){return/[\?|\*]/.test(a)|| /\s+OR\s+/i.test(b)?(b=g.config,a=a.replace(/\s+OR\s+/gi,"|"),!b.$headers.filter('[data-column="'+h+'"]:last').hasClass("filter-match")&&/\|/.test(a)&&(a=k.isArray(p)?"("+a+")":"^("+a+")$"),RegExp(a.replace(/\?/g,"\\S{1}").replace(/\*/g,"\\S*")).test(e)):null},fuzzy:function(b,a,c,d){if(/^~/.test(a)){b=0;c=d.length;var f=a.slice(1);for(a=0;a<c;a++)d[a]===f[b]&&(b+=1);return b===f.length?!0:!1}return null}},init:function(b,a,c){var e,f,h,g,l,n;a.debug&&(n=new Date);a.$table.addClass("hasFilters"); d.filter.regex.child=RegExp(a.cssChildRow);d.filter.regex.filtered=RegExp(c.filter_filteredRow);!1!==c.filter_columnFilters&&a.$headers.filter(".filter-false").length!==a.$headers.length&&d.filter.buildRow(b,a,c);a.$table.bind("addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter "),function(e,f){a.$table.find("."+d.css.filterRow).toggle(!(c.filter_hideEmpty&&k.isEmptyObject(a.cache)));/(search|filter)/.test(e.type)||(e.stopPropagation(), d.filter.buildDefault(b,!0));"filterReset"===e.type?d.filter.searching(b,[]):"filterEnd"===e.type?d.filter.buildDefault(b,!0):(f="search"===e.type?f:"updateComplete"===e.type?a.$table.data("lastSearch"):"",/(update|add)/.test(e.type)&&"updateComplete"!==e.type&&(a.lastCombinedFilter=null),d.filter.searching(b,f,!0));return!1});c.filter_reset&&(c.filter_reset instanceof k?c.filter_reset.click(function(){a.$table.trigger("filterReset")}):k(c.filter_reset).length&&k(document).undelegate(c.filter_reset, "click.tsfilter").delegate(c.filter_reset,"click.tsfilter",function(){a.$table.trigger("filterReset")}));if(c.filter_functions)for(g in c.filter_functions)if(c.filter_functions.hasOwnProperty(g)&&"string"===typeof g)if(h=a.$headers.filter('[data-column="'+g+'"]:last'),e="",!0===c.filter_functions[g]&&!h.hasClass("filter-false"))d.filter.buildSelect(b,g);else if("string"===typeof g&&!h.hasClass("filter-false")){for(f in c.filter_functions[g])"string"===typeof f&&(e+=""===e?'<option value="">'+(h.data("placeholder")|| h.attr("data-placeholder")||c.filter_placeholder.select||"")+"</option>":"",e+='<option value="'+f+'">'+f+"</option>");a.$table.find("thead").find("select."+d.css.filter+'[data-column="'+g+'"]').append(e)}d.filter.buildDefault(b,!0);d.filter.bindSearch(b,a.$table.find("."+d.css.filter),!0);c.filter_external&&d.filter.bindSearch(b,c.filter_external);c.filter_hideFilters&&d.filter.hideFilters(b,a);a.showProcessing&&a.$table.bind("filterStart"+a.namespace+"filter filterEnd"+a.namespace+"filter",function(c, e){h=e?a.$table.find("."+d.css.header).filter("[data-column]").filter(function(){return""!==e[k(this).data("column")]}):"";d.isProcessing(b,"filterStart"===c.type,e?h:"")});a.debug&&d.benchmark("Applying Filter widget",n);a.$table.bind("tablesorter-initialized pagerInitialized",function(){l=d.filter.setDefaults(b,a,c)||[];l.length&&d.setFilters(b,l,!0);a.$table.trigger("filterFomatterUpdate");d.filter.checkFilters(b,l)});c.filter_initialized=!0;a.$table.trigger("filterInit")},setDefaults:function(b, a,c){var e,f=d.getFilters(b)||[];c.filter_saveFilters&&d.storage&&(e=d.storage(b,"tablesorter-filters")||[],(b=k.isArray(e))&&""===e.join("")||!b||(f=e));if(""===f.join(""))for(b=0;b<a.columns;b++)f[b]=a.$headers.filter('[data-column="'+b+'"]:last').attr(c.filter_defaultAttrib)||f[b];a.$table.data("lastSearch",f);return f},buildRow:function(b,a,c){var e,f,h,g=a.columns;f='<tr class="'+d.css.filterRow+'">';for(b=0;b<g;b++)f+="<td></td>";a.$filters=k(f+"</tr>").appendTo(a.$table.children("thead").eq(0)).find("td"); for(b=0;b<g;b++)e=a.$headers.filter('[data-column="'+b+'"]:last'),f=c.filter_functions&&c.filter_functions[b]&&"function"!==typeof c.filter_functions[b]||e.hasClass("filter-select"),h=d.getData?"false"===d.getData(e[0],a.headers[b],"filter"):a.headers[b]&&a.headers[b].hasOwnProperty("filter")&&!1===a.headers[b].filter||e.hasClass("filter-false"),f?f=k("<select>").appendTo(a.$filters.eq(b)):(c.filter_formatter&&k.isFunction(c.filter_formatter[b])?((f=c.filter_formatter[b](a.$filters.eq(b),b))&&0=== f.length&&(f=a.$filters.eq(b).children("input")),f&&(0===f.parent().length||f.parent().length&&f.parent()[0]!==a.$filters[b])&&a.$filters.eq(b).append(f)):f=k('<input type="search">').appendTo(a.$filters.eq(b)),f&&f.attr("placeholder",e.data("placeholder")||e.attr("data-placeholder")||c.filter_placeholder.search||"")),f&&(e=(k.isArray(c.filter_cssFilter)?"undefined"!==typeof c.filter_cssFilter[b]?c.filter_cssFilter[b]||"":"":c.filter_cssFilter)||"",f.addClass(d.css.filter+" "+e).attr("data-column", b),h&&(f.attr("placeholder","").addClass("disabled")[0].disabled=!0))},bindSearch:function(b,a,c){b=k(b)[0];a=k(a);if(a.length){var e=b.config,f=e.widgetOptions,h=f.filter_$externalFilters;!0!==c&&(f.filter_$anyMatch=a.filter('[data-column="all"]'),f.filter_$externalFilters=h&&h.length?f.filter_$externalFilters.add(a):a,d.setFilters(b,e.$table.data("lastSearch")||[],!1===c));a.attr("data-lastSearchTime",(new Date).getTime()).unbind(["keyup","search","change",""].join(e.namespace+"filter ")).bind(["keyup", "search","change",""].join(e.namespace+"filter "),function(a){k(this).attr("data-lastSearchTime",(new Date).getTime());if(27===a.which)this.value="";else if("number"===typeof f.filter_liveSearch&&this.value.length<f.filter_liveSearch&&""!==this.value||"keyup"===a.type&&(32>a.which&&8!==a.which&&!0===f.filter_liveSearch&&13!==a.which||37<=a.which&&40>=a.which||13!==a.which&&!1===f.filter_liveSearch))return;d.filter.searching(b,!0,!0)});e.$table.bind("filterReset",function(){a.val("")})}},checkFilters:function(b, a,c){var e=b.config,f=e.widgetOptions,h=k.isArray(a),g=h?a:d.getFilters(b,!0),l=(g||[]).join("");h&&d.setFilters(b,g,!1,!0!==c);f.filter_hideFilters&&e.$table.find("."+d.css.filterRow).trigger(""===l?"mouseleave":"mouseenter");if(e.lastCombinedFilter!==l||!1===a)if(!1===a&&(e.lastCombinedFilter=null),e.$table.trigger("filterStart",[g]),e.showProcessing)setTimeout(function(){d.filter.findRows(b,g,l);return!1},30);else return d.filter.findRows(b,g,l),!1},hideFilters:function(b,a){var c,e,f;k(b).find("."+ d.css.filterRow).addClass("hideme").bind("mouseenter mouseleave",function(b){c=k(this);clearTimeout(f);f=setTimeout(function(){/enter|over/.test(b.type)?c.removeClass("hideme"):k(document.activeElement).closest("tr")[0]!==c[0]&&""===a.lastCombinedFilter&&c.addClass("hideme")},200)}).find("input, select").bind("focus blur",function(b){e=k(this).closest("tr");clearTimeout(f);f=setTimeout(function(){if(""===d.getFilters(a.$table).join(""))e["focus"===b.type?"removeClass":"addClass"]("hideme")},200)})}, findRows:function(b,a,c){if(b.config.lastCombinedFilter!==c){var e,f,h,g,l,n,p,m,u,t,s,w,v,x,z,y,C,A,B,K,D,F,G,H,I,L,q=b.config,r=q.widgetOptions,M=q.columns,J=q.$table.children("tbody"),N=["range","notMatch","operators"],E=q.$headers.map(function(a){return q.parsers&&q.parsers[a]&&q.parsers[a].parsed||d.getData&&"parsed"===d.getData(q.$headers.filter('[data-column="'+a+'"]:last'),q.headers[a],"filter")||k(this).hasClass("filter-parsed")}).get();q.debug&&(K=new Date);for(l=0;l<J.length;l++)if(!J.eq(l).hasClass(q.cssInfoBlock|| d.css.info)){n=d.processTbody(b,J.eq(l),!0);m=q.columns;h=k(k.map(q.cache[l].normalized,function(a){return a[m].$row.get()}));f=h.length;if(""===c||r.filter_serversideFiltering)h.removeClass(r.filter_filteredRow).not("."+q.cssChildRow).show();else{C=!0;x=q.lastSearch||q.$table.data("lastSearch")||[];k.each(a,function(a,b){C=C&&0===(b||"").indexOf(x[a])&&!/(\s+or\s+|\|)/g.test(b||"")&&!/[=\"]/.test(x[a])&&!(""!==b&&r.filter_functions&&!0===r.filter_functions[a]&&!q.$headers.filter('[data-column="'+ a+'"]:last').hasClass("filter-match"))});p=h.not("."+r.filter_filteredRow).length;C&&0===p&&(C=!1);q.debug&&d.log("Searching through "+(C&&p<f?p:"all")+" rows");if(r.filter_$anyMatch&&r.filter_$anyMatch.length||a[q.columns])D=r.filter_$anyMatch&&r.filter_$anyMatch.val()||a[q.columns]||"",q.sortLocaleCompare&&(D=d.replaceAccents(D)),F=D.toLowerCase();for(g=0;g<f;g++)if(u=h[g].className,!(d.filter.regex.child.test(u)||C&&d.filter.regex.filtered.test(u))){B=!0;u=h.eq(g).nextUntil("tr:not(."+q.cssChildRow+ ")");t=u.length&&r.filter_childRows?u.text():"";t=r.filter_ignoreCase?t.toLocaleLowerCase():t;p=h.eq(g).children();D&&(G=p.map(function(a){E[a]?a=q.cache[l].normalized[g][a]:(a=r.filter_ignoreCase?k(this).text().toLowerCase():k(this).text(),q.sortLocaleCompare&&(a=d.replaceAccents(a)));return a}).get(),H=G.join(" "),I=H.toLowerCase(),L=q.cache[l].normalized[g].slice(0,-1).join(" "),A=null,k.each(d.filter.types,function(a,c){if(0>k.inArray(a,N)&&(z=c(D,F,H,I,L,M,b,r,E,G),null!==z))return A=z,!1}), B=null!==A?A:0<=(I+t).indexOf(F));for(m=0;m<M;m++)a[m]&&(e=q.cache[l].normalized[g][m],r.filter_useParsedData||E[m]?s=e:(s=k.trim(p.eq(m).text()),s=q.sortLocaleCompare?d.replaceAccents(s):s),w=!d.filter.regex.type.test(typeof s)&&r.filter_ignoreCase?s.toLocaleLowerCase():s,y=B,a[m]=q.sortLocaleCompare?d.replaceAccents(a[m]):a[m],v=r.filter_ignoreCase?(a[m]||"").toLocaleLowerCase():a[m],r.filter_functions&&r.filter_functions[m]?!0===r.filter_functions[m]?y=q.$headers.filter('[data-column="'+m+'"]:last').hasClass("filter-match")? 0<=w.search(v):a[m]===s:"function"===typeof r.filter_functions[m]?y=r.filter_functions[m](s,e,a[m],m,h.eq(g)):"function"===typeof r.filter_functions[m][a[m]]&&(y=r.filter_functions[m][a[m]](s,e,a[m],m,h.eq(g))):(A=null,k.each(d.filter.types,function(c,d){z=d(a[m],v,s,w,e,m,b,r,E);if(null!==z)return A=z,!1}),null!==A?y=A:(s=(w+t).indexOf(v),y=!r.filter_startsWith&&0<=s||r.filter_startsWith&&0===s)),B=y?B:!1);h.eq(g).toggle(B).toggleClass(r.filter_filteredRow,!B);u.length&&u.toggleClass(r.filter_filteredRow, !B)}}d.processTbody(b,n,!1)}q.lastCombinedFilter=c;q.lastSearch=a;q.$table.data("lastSearch",a);r.filter_saveFilters&&d.storage&&d.storage(b,"tablesorter-filters",a);q.debug&&d.benchmark("Completed filter widget search",K);q.$table.trigger("filterEnd");setTimeout(function(){q.$table.trigger("applyWidgets")},0)}},getOptionSource:function(b,a,c){var e,f=b.config,h=[],g=!1,l=f.widgetOptions.filter_selectSource;k.isFunction(l)?g=l(b,a,c):"object"===k.type(l)&&l.hasOwnProperty(a)&&(g=l[a](b,a,c));!1=== g&&(g=d.filter.getOptions(b,a,c));g=k.grep(g,function(a,b){return k.inArray(a,g)===b});f.$headers.filter('[data-column="'+a+'"]:last').hasClass("filter-select-nosort")||(k.each(g,function(c,e){h.push({t:e,p:f.parsers&&f.parsers[a].format(e,b,[],a)||e})}),e=f.textSorter||"",h.sort(function(c,f){var g=c.p.toString(),h=f.p.toString();return k.isFunction(e)?e(g,h,!0,a,b):"object"===typeof e&&e.hasOwnProperty(a)?e[a](g,h,!0,a,b):d.sortNatural?d.sortNatural(g,h):!0}),g=[],k.each(h,function(a,b){g.push(b.t)})); return g},getOptions:function(b,a,c){var e,d,h,g,l=b.config,n=l.widgetOptions,p=l.$table.children("tbody"),m=[];for(e=0;e<p.length;e++)if(!p.eq(e).hasClass(l.cssInfoBlock))for(g=l.cache[e],d=l.cache[e].normalized.length,b=0;b<d;b++)h=g.row?g.row[b]:g.normalized[b][l.columns].$row[0],c&&h.className.match(n.filter_filteredRow)||(n.filter_useParsedData?m.push(""+g.normalized[b][a]):(h=h.cells[a])&&m.push(k.trim(h.textContent||h.innerText||k(h).text())));return m},buildSelect:function(b,a,c,e){if(b.config.cache&& !k.isEmptyObject(b.config.cache)){a=parseInt(a,10);var f;f=b.config;var h=f.widgetOptions,g=f.$headers.filter('[data-column="'+a+'"]:last'),g='<option value="">'+(g.data("placeholder")||g.attr("data-placeholder")||h.filter_placeholder.select||"")+"</option>",l=d.filter.getOptionSource(b,a,e),n=f.$table.find("thead").find("select."+d.css.filter+'[data-column="'+a+'"]').val();for(b=0;b<l.length;b++)e=l[b].replace(/\"/g,"&quot;"),g+=""!==l[b]?'<option value="'+e+'"'+(n===e?' selected="selected"':"")+ ">"+l[b]+"</option>":"";f=(f.$filters?f.$filters:f.$table.children("thead")).find("."+d.css.filter);h.filter_$externalFilters&&(f=f&&f.length?f.add(h.filter_$externalFilters):h.filter_$externalFilters);f.filter('select[data-column="'+a+'"]')[c?"html":"append"](g)}},buildDefault:function(b,a){var c,e,f=b.config,h=f.widgetOptions,g=f.columns;for(c=0;c<g;c++)e=f.$headers.filter('[data-column="'+c+'"]:last'),(e.hasClass("filter-select")||h.filter_functions&&!0===h.filter_functions[c])&&!e.hasClass("filter-false")&& (h.filter_functions||(h.filter_functions={}),h.filter_functions[c]=!0,d.filter.buildSelect(b,c,a,e.hasClass(h.filter_onlyAvail)))},searching:function(b,a,c){if("undefined"===typeof a||!0===a){var e=b.config.widgetOptions;clearTimeout(e.searchTimer);e.searchTimer=setTimeout(function(){d.filter.checkFilters(b,a,c)},e.filter_liveSearch?e.filter_searchDelay:10)}else d.filter.checkFilters(b,a,c)}};
+d.getFilters=function(b,a,c,e){var f,h=!1,g=b?k(b)[0].config:"",l=g?g.widgetOptions:"";if(!0!==a&&l&&!l.filter_columnFilters)return k(b).data("lastSearch"); if(g&&(g.$filters&&(f=g.$filters.find("."+d.css.filter)),l.filter_$externalFilters&&(f=f&&f.length?f.add(l.filter_$externalFilters):l.filter_$externalFilters),f&&f.length))for(h=c||[],b=0;b<g.columns+1;b++)a=f.filter('[data-column="'+(b===g.columns?"all":b)+'"]'),a.length&&(a=a.sort(function(a,b){return k(b).attr("data-lastSearchTime")-k(a).attr("data-lastSearchTime")}),k.isArray(c)?(e?a.slice(1):a).val(c[b]).trigger("change.tsfilter"):(h[b]=a.val()||"",a.slice(1).val(h[b])),b===g.columns&&a.length&& (l.filter_$anyMatch=a));0===h.length&&(h=!1);return h};
+d.setFilters=function(b,a,c,e){var f=b?k(b)[0].config:"";b=d.getFilters(b,!0,a,e);f&&c&&(f.lastCombinedFilter=null,d.filter.searching(f.$table[0],a,e),f.$table.trigger("filterFomatterUpdate"));return!!b};
+d.addWidget({id:"stickyHeaders",priority:60,options:{stickyHeaders:"",stickyHeaders_attachTo:null,stickyHeaders_offset:0,stickyHeaders_filteredToTop:!0,stickyHeaders_cloneId:"-sticky",stickyHeaders_addResizeEvent:!0,stickyHeaders_includeCaption:!0, stickyHeaders_zIndex:2},format:function(b,a,c){if(!(a.$table.hasClass("hasStickyHeaders")||0<=k.inArray("filter",a.widgets)&&!a.$table.hasClass("hasFilters"))){var e=a.$table,f=k(c.stickyHeaders_attachTo),h=e.children("thead:first"),g=f.length?f:k(window),l=h.children("tr").not(".sticky-false").children(),n="."+d.css.headerIn,p=e.find("tfoot"),m=isNaN(c.stickyHeaders_offset)?k(c.stickyHeaders_offset):"",u=f.length?0:m.length?m.height()||0:parseInt(c.stickyHeaders_offset,10)||0,t=c.$sticky=e.clone().addClass("containsStickyHeaders").css({position:f.length? "absolute":"fixed",margin:0,top:u,left:0,visibility:"hidden",zIndex:c.stickyHeaders_zIndex?c.stickyHeaders_zIndex:2}),s=t.children("thead:first").addClass(d.css.sticky+" "+c.stickyHeaders),w,v="",x=0,z="collapse"!==e.css("border-collapse")&&!/(webkit|msie)/i.test(navigator.userAgent),y=function(){u=m.length?m.height()||0:parseInt(c.stickyHeaders_offset,10)||0;x=0;z&&(x=2*parseInt(l.eq(0).css("border-left-width"),10));t.css({left:f.length?(parseInt(f.css("padding-left"),10)||0)+parseInt(a.$table.css("padding-left"), 10)+parseInt(a.$table.css("margin-left"),10)+parseInt(e.css("border-left-width"),10):h.offset().left-g.scrollLeft()-x,width:e.width()});w.filter(":visible").each(function(b){b=l.filter(":visible").eq(b);var c=z&&k(this).attr("data-column")===""+parseInt(a.columns/2,10)?1:0;k(this).css({width:b.width()-x}).find(n).width(b.find(n).width()-c)})};t.attr("id")&&(t[0].id+=c.stickyHeaders_cloneId);t.find("thead:gt(0), tr.sticky-false").hide();t.find("tbody, tfoot").remove();c.stickyHeaders_includeCaption? t.find("caption").css("margin-left","-1px"):t.find("caption").remove();w=s.children().children();t.css({height:0,width:0,padding:0,margin:0,border:0});w.find("."+d.css.resizer).remove();e.addClass("hasStickyHeaders").bind("pagerComplete.tsSticky",function(){y()});d.bindEvents(b,s.children().children(".tablesorter-header"));e.after(t);g.bind("scroll.tsSticky resize.tsSticky",function(a){if(e.is(":visible")){var b=e.offset(),d=c.stickyHeaders_includeCaption?0:e.find("caption").outerHeight(!0),d=(f.length? f.offset().top:g.scrollTop())+u-d,k=e.height()-(t.height()+(p.height()||0)),b=d>b.top&&d<b.top+k?"visible":"hidden",d={visibility:b};f.length?d.top=f.scrollTop():d.left=h.offset().left-g.scrollLeft()-x;t.removeClass("tablesorter-sticky-visible tablesorter-sticky-hidden").addClass("tablesorter-sticky-"+b).css(d);if(b!==v||"resize"===a.type)y(),v=b}});c.stickyHeaders_addResizeEvent&&d.addHeaderResizeEvent(b);e.hasClass("hasFilters")&&(e.bind("filterEnd",function(){var b=k(document.activeElement).closest("td"), b=b.parent().children().index(b);t.hasClass(d.css.stickyVis)&&c.stickyHeaders_filteredToTop&&(window.scrollTo(0,e.position().top),0<=b&&a.$filters&&a.$filters.eq(b).find("a, select, input").filter(":visible").focus())}),d.filter.bindSearch(e,w.find("."+d.css.filter)),c.filter_hideFilters&&d.filter.hideFilters(t,a));e.trigger("stickyHeadersInit")}},remove:function(b,a,c){a.$table.removeClass("hasStickyHeaders").unbind("pagerComplete.tsSticky").find("."+d.css.sticky).remove();c.$sticky&&c.$sticky.length&& c.$sticky.remove();k(".hasStickyHeaders").length||k(window).unbind("scroll.tsSticky resize.tsSticky");d.addHeaderResizeEvent(b,!1)}});
+d.addWidget({id:"resizable",priority:40,options:{resizable:!0,resizable_addLastColumn:!1,resizable_widths:[]},format:function(b,a,c){if(!a.$table.hasClass("hasResizable")){a.$table.addClass("hasResizable");d.resizableReset(b,!0);var e,f,h,g,l={},n=a.$table,p=0,m=null,u=null,t=20>Math.abs(n.parent().width()-n.width()),s=function(){d.storage&&m&&u&&(l={},l[m.index()]= m.width(),l[u.index()]=u.width(),m.width(l[m.index()]),u.width(l[u.index()]),!1!==c.resizable&&d.storage(b,"tablesorter-resizable",a.$headers.map(function(){return k(this).width()}).get()));p=0;m=u=null;k(window).trigger("resize")};if(l=d.storage&&!1!==c.resizable?d.storage(b,"tablesorter-resizable"):{})for(g in l)!isNaN(g)&&g<a.$headers.length&&a.$headers.eq(g).width(l[g]);e=n.children("thead:first").children("tr");e.children().each(function(){var b;b=k(this);g=b.attr("data-column");b="false"=== d.getData(b,a.headers[g],"resizable");e.children().filter('[data-column="'+g+'"]')[b?"addClass":"removeClass"]("resizable-false")});e.each(function(){h=k(this).children().not(".resizable-false");k(this).find("."+d.css.wrapper).length||h.wrapInner('<div class="'+d.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>');c.resizable_addLastColumn||(h=h.slice(0,-1));f=f?f.add(h):h});f.each(function(){var a=k(this),b=parseInt(a.css("padding-right"),10)+10;a.find("."+d.css.wrapper).append('<div class="'+ d.css.resizer+'" style="cursor:w-resize;position:absolute;z-index:1;right:-'+b+'px;top:0;height:100%;width:20px;"></div>')}).bind("mousemove.tsresize",function(a){if(0!==p&&m){var b=a.pageX-p,c=m.width();m.width(c+b);m.width()!==c&&t&&u.width(u.width()-b);p=a.pageX}}).bind("mouseup.tsresize",function(){s()}).find("."+d.css.resizer+",."+d.css.grip).bind("mousedown",function(b){m=k(b.target).closest("th");var c=a.$headers.filter('[data-column="'+m.attr("data-column")+'"]');1<c.length&&(m=m.add(c)); u=b.shiftKey?m.parent().find("th").not(".resizable-false").filter(":last"):m.nextAll(":not(.resizable-false)").eq(0);p=b.pageX});n.find("thead:first").bind("mouseup.tsresize mouseleave.tsresize",function(){s()}).bind("contextmenu.tsresize",function(){d.resizableReset(b);var a=k.isEmptyObject?k.isEmptyObject(l):!0;l={};return a})}},remove:function(b,a){a.$table.removeClass("hasResizable").children("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").children("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find("."+ d.css.resizer+",."+d.css.grip).remove();d.resizableReset(b)}});
+d.resizableReset=function(b,a){k(b).each(function(){var c,e=this.config,f=e&&e.widgetOptions;b&&e&&(e.$headers.each(function(a){c=k(this);f.resizable_widths[a]?c.css("width",f.resizable_widths[a]):c.hasClass("resizable-false")||c.css("width","")}),d.storage&&!a&&d.storage(this,"tablesorter-resizable",{}))})};
+d.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(b,a,c,d){a.format(b,c,d,!0)},format:function(b,a,c,e){var f, h=a.$table;c=!1!==c.saveSort;var g={sortList:a.sortList};a.debug&&(f=new Date);h.hasClass("hasSaveSort")?c&&b.hasInitialized&&d.storage&&(d.storage(b,"tablesorter-savesort",g),a.debug&&d.benchmark("saveSort widget: Saving last sort: "+a.sortList,f)):(h.addClass("hasSaveSort"),g="",d.storage&&(g=(c=d.storage(b,"tablesorter-savesort"))&&c.hasOwnProperty("sortList")&&k.isArray(c.sortList)?c.sortList:"",a.debug&&d.benchmark('saveSort: Last sort loaded: "'+g+'"',f),h.bind("saveSortReset",function(a){a.stopPropagation(); d.storage(b,"tablesorter-savesort","")})),e&&g&&0<g.length?a.sortList=g:b.hasInitialized&&g&&0<g.length&&h.trigger("sorton",[g]))},remove:function(b){d.storage&&d.storage(b,"tablesorter-savesort","")}})
+})(jQuery);
diff --git a/data/js/newShow.js b/data/js/newShow.js
index d8bf3f201c..5cb5d627b3 100644
--- a/data/js/newShow.js
+++ b/data/js/newShow.js
@@ -187,14 +187,14 @@ $(document).ready(function () {
         // also toggle the add show button
         if (($("#rootDirs option:selected").length || ($('#fullShowPath').length && $('#fullShowPath').val().length)) &&
             ($('input:radio[name=whichSeries]:checked').length) || ($('input:hidden[name=whichSeries]').length && $('input:hidden[name=whichSeries]').val().length)) {
-            $('#addShowButton').attr('disabled', false);
+            $('#addShowButton').prop('disabled', false);
         } else {
-            $('#addShowButton').attr('disabled', true);
+            $('#addShowButton').prop('disabled', true);
         }
     }
 
     $('#rootDirText').change(updateSampleText);
-    $('#whichSeries').live('change', updateSampleText);
+    $('#searchResults').on('change', '#whichSeries', updateSampleText);
 
     $('#nameToSearch').keyup(function (event) {
         if (event.keyCode == 13) {
diff --git a/data/js/qualityChooser.js b/data/js/qualityChooser.js
index 66b582e1b6..500a814a4c 100644
--- a/data/js/qualityChooser.js
+++ b/data/js/qualityChooser.js
@@ -10,18 +10,18 @@ $(document).ready(function() {
         $('#anyQualities option').each(function(i) {
             var result = preset & $(this).val();
             if (result > 0) {
-                $(this).attr('selected', 'selected');
+                $(this).prop('selected', true);
             } else {
-                $(this).attr('selected', false);
+                $(this).prop('selected', false);
             }
         });
 
         $('#bestQualities option').each(function(i) {
             var result = preset & ($(this).val() << 16);
             if (result > 0) {
-                $(this).attr('selected', 'selected');
+                $(this).prop('selected', true);
             } else {
-                $(this).attr('selected', false);
+                $(this).prop('selected', false);
             }
         });
 
diff --git a/data/js/rootDirs.js b/data/js/rootDirs.js
index 6d6799b36d..4c414bbbc9 100644
--- a/data/js/rootDirs.js
+++ b/data/js/rootDirs.js
@@ -35,7 +35,7 @@ $(document).ready(function() {
             is_default = true;
         }
 
-        $('#rootDirs').append('<option value="'+path+'">'+path+'</option>');
+        $('#rootDirs').append('<option value="' + path + '">' + path + '</option>');
 
         syncOptionIDs();
 
diff --git a/lib/tvdb_api/readme.md b/lib/tvdb_api/readme.md
index a34726e5d8..abfc542ae6 100644
--- a/lib/tvdb_api/readme.md
+++ b/lib/tvdb_api/readme.md
@@ -63,7 +63,7 @@ For example, to find out what network Scrubs is aired:
 The data is stored in an attribute named `data`, within the Show instance:
 
     >>> t['scrubs'].data.keys()
-    ['networkid', 'rating', 'airs_dayofweek', 'contentrating', 'seriesname', 'id', 'airs_time', 'network', 'fanart', 'lastupdated', 'actors', 'ratingcount', 'status', 'added', 'poster', 'imdb_id', 'genre', 'banner', 'seriesid', 'language', 'zap2it_id', 'addedby', 'firstaired', 'runtime', 'overview']
+    ['networkid', 'rating', 'airs_dayofweek', 'contentrating', 'seriesname', 'id', 'airs_time', 'network', 'fanart', 'lastupdated', 'actors', 'ratingcount', 'status', 'added', 'poster', 'imdb_id', 'genre', 'banner', 'seriesid', 'language', 'zap2it_id', 'addedby', 'tms_wanted', 'firstaired', 'runtime', 'overview']
 
 Although each element is also accessible via `t['scrubs']` for ease-of-use:
 
diff --git a/lib/tvdb_api/tests/test_tvdb_api.py b/lib/tvdb_api/tests/test_tvdb_api.py
index 765b04fcbc..f1ffd162f1 100644
--- a/lib/tvdb_api/tests/test_tvdb_api.py
+++ b/lib/tvdb_api/tests/test_tvdb_api.py
@@ -99,6 +99,10 @@ def test_get_parent(self):
             show
         )
 
+    def test_no_season(self):
+        show = self.t['Katekyo Hitman Reborn']
+        print tvdb_api
+        print show[1][1]
 
 class test_tvdb_errors(unittest.TestCase):
     # Used to store the cached instance of Tvdb()
diff --git a/lib/tvdb_api/tvdb_api.py b/lib/tvdb_api/tvdb_api.py
index df3197d255..09702886b5 100644
--- a/lib/tvdb_api/tvdb_api.py
+++ b/lib/tvdb_api/tvdb_api.py
@@ -65,16 +65,12 @@ def __setitem__(self, key, value):
 
         #keep only the 100th latest results
         if time.time() - self._lastgc > 20:
-            tbd = self._stack[:-100]
-            i = 0
-            for o in tbd:
+            for o in self._stack[:-100]:
                 del self[o]
-                del self._stack[i]
-                i += 1
+            self._stack = self._stack[-100:]
+
+            self._lastgc = time.time()
 
-            _lastgc = time.time()
-            del tbd
-                    
         super(ShowContainer, self).__setitem__(key, value)
 
 
@@ -821,11 +817,22 @@ def _getShowData(self, sid, language):
                 use_dvd = False
 
             if use_dvd:
-                seas_no = int(cur_ep.find('DVD_season').text)
-                ep_no   = int(float(cur_ep.find('DVD_episodenumber').text))
+                elem_seasnum, elem_epno = cur_ep.find('DVD_season'), cur_ep.find('DVD_episodenumber')
             else:
-                seas_no = int(cur_ep.find('SeasonNumber').text)
-                ep_no = int(cur_ep.find('EpisodeNumber').text)
+                elem_seasnum, elem_epno = cur_ep.find('SeasonNumber'), cur_ep.find('EpisodeNumber')
+
+            if elem_seasnum is None or elem_epno is None:
+                log().warning("An episode has incomplete season/episode number (season: %r, episode: %r)" % (
+                    elem_seasnum, elem_epno))
+                log().debug(
+                    " ".join(
+                        "%r is %r" % (child.tag, child.text) for child in cur_ep.getchildren()))
+                # TODO: Should this happen?
+                continue # Skip to next episode
+
+            # float() is because https://github.com/dbr/tvnamer/issues/95 - should probably be fixed in TVDB data
+            seas_no = int(float(elem_seasnum.text))
+            ep_no = int(float(elem_epno.text))
 
             for cur_item in cur_ep.getchildren():
                 tag = cur_item.tag.lower()
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index a03231ae9d..0f9a634cae 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -58,7 +58,7 @@
 CONFIG_FILE = None
 
 # this is the version of the config we EXPECT to find
-CONFIG_VERSION = 5
+CONFIG_VERSION = 6
 
 PROG_DIR = '.'
 MY_FULLNAME = None
@@ -207,6 +207,7 @@
 NZBGET_HOST = None
 
 USE_XBMC = False
+XBMC_ALWAYS_ON = True
 XBMC_NOTIFY_ONSNATCH = False
 XBMC_NOTIFY_ONDOWNLOAD = False
 XBMC_UPDATE_LIBRARY = False
@@ -266,6 +267,9 @@
 NMJ_MOUNT = None
 
 USE_SYNOINDEX = False
+SYNOINDEX_NOTIFY_ONSNATCH = False
+SYNOINDEX_NOTIFY_ONDOWNLOAD = False
+SYNOINDEX_UPDATE_LIBRARY = False
 
 USE_NMJv2 = False
 NMJv2_HOST = None
@@ -317,7 +321,7 @@ def initialize(consoleLogging=True):
                 USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, \
                 SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \
                 NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_HOST, currentSearchScheduler, backlogSearchScheduler, \
-                USE_XBMC, XBMC_NOTIFY_ONSNATCH, XBMC_NOTIFY_ONDOWNLOAD, XBMC_UPDATE_FULL, XBMC_UPDATE_ONLYFIRST, \
+                USE_XBMC, XBMC_ALWAYS_ON, XBMC_NOTIFY_ONSNATCH, XBMC_NOTIFY_ONDOWNLOAD, XBMC_UPDATE_FULL, XBMC_UPDATE_ONLYFIRST, \
                 XBMC_UPDATE_LIBRARY, XBMC_HOST, XBMC_USERNAME, XBMC_PASSWORD, \
                 USE_TRAKT, TRAKT_USERNAME, TRAKT_PASSWORD, TRAKT_API, \
                 USE_PLEX, PLEX_NOTIFY_ONSNATCH, PLEX_NOTIFY_ONDOWNLOAD, PLEX_UPDATE_LIBRARY, \
@@ -340,7 +344,8 @@ def initialize(consoleLogging=True):
                 EXTRA_SCRIPTS, USE_TWITTER, TWITTER_USERNAME, TWITTER_PASSWORD, TWITTER_PREFIX, \
                 USE_BOXCAR, BOXCAR_USERNAME, BOXCAR_PASSWORD, BOXCAR_NOTIFY_ONDOWNLOAD, BOXCAR_NOTIFY_ONSNATCH, \
                 USE_PUSHOVER, PUSHOVER_USERKEY, PUSHOVER_NOTIFY_ONDOWNLOAD, PUSHOVER_NOTIFY_ONSNATCH, \
-                USE_LIBNOTIFY, LIBNOTIFY_NOTIFY_ONSNATCH, LIBNOTIFY_NOTIFY_ONDOWNLOAD, USE_NMJ, NMJ_HOST, NMJ_DATABASE, NMJ_MOUNT, USE_NMJv2, NMJv2_HOST, NMJv2_DATABASE, NMJv2_DBLOC, USE_SYNOINDEX, \
+                USE_LIBNOTIFY, LIBNOTIFY_NOTIFY_ONSNATCH, LIBNOTIFY_NOTIFY_ONDOWNLOAD, USE_NMJ, NMJ_HOST, NMJ_DATABASE, NMJ_MOUNT, USE_NMJv2, NMJv2_HOST, NMJv2_DATABASE, NMJv2_DBLOC, \
+                USE_SYNOINDEX, SYNOINDEX_NOTIFY_ONSNATCH, SYNOINDEX_NOTIFY_ONDOWNLOAD, SYNOINDEX_UPDATE_LIBRARY, \
                 USE_LISTVIEW, METADATA_XBMC, METADATA_XBMC_12PLUS, METADATA_MEDIABROWSER, METADATA_MEDE8ER, METADATA_PS3, metadata_provider_dict, \
                 GIT_PATH, MOVE_ASSOCIATED_FILES, \
                 COMING_EPS_LAYOUT, COMING_EPS_SORT, COMING_EPS_DISPLAY_PAUSED, METADATA_WDTV, METADATA_TIVO, IGNORE_WORDS, CREATE_MISSING_SHOW_DIRS, \
@@ -528,6 +533,7 @@ def initialize(consoleLogging=True):
 
         CheckSection(CFG, 'XBMC')
         USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0))
+        XBMC_ALWAYS_ON = bool(check_setting_int(CFG, 'XBMC', 'xbmc_always_on', 1))
         XBMC_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_onsnatch', 0))
         XBMC_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_ondownload', 0))
         XBMC_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_library', 0))
@@ -600,6 +606,9 @@ def initialize(consoleLogging=True):
 
         CheckSection(CFG, 'Synology')
         USE_SYNOINDEX = bool(check_setting_int(CFG, 'Synology', 'use_synoindex', 0))
+        SYNOINDEX_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Synology', 'synoindex_notify_onsnatch', 0))
+        SYNOINDEX_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Synology', 'synoindex_notify_ondownload', 0))
+        SYNOINDEX_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'Synology', 'synoindex_update_library', 0))
 
         CheckSection(CFG, 'Trakt')
         USE_TRAKT = bool(check_setting_int(CFG, 'Trakt', 'use_trakt', 0))
@@ -663,55 +672,66 @@ def initialize(consoleLogging=True):
         newznabProviderList = providers.getNewznabProviderList(NEWZNAB_DATA)
         providerList = providers.makeProviderList()
 
-        # initialize schedulars
-        currentSearchScheduler = scheduler.Scheduler(searchCurrent.CurrentSearcher(),
-                                                     cycleTime=datetime.timedelta(minutes=SEARCH_FREQUENCY),
-                                                     threadName="SEARCH",
-                                                     runImmediately=True)
-
-        # the interval for this is stored inside the ShowUpdater class
-        showUpdaterInstance = showUpdater.ShowUpdater()
-        showUpdateScheduler = scheduler.Scheduler(showUpdaterInstance,
-                                               cycleTime=showUpdaterInstance.updateInterval,
-                                               threadName="SHOWUPDATER",
-                                               runImmediately=False)
+        # initialize schedulers
 
+        # updaters
         versionCheckScheduler = scheduler.Scheduler(versionChecker.CheckVersion(),
-                                                     cycleTime=datetime.timedelta(hours=12),
-                                                     threadName="CHECKVERSION",
-                                                     runImmediately=True)
+                                                    cycleTime=datetime.timedelta(hours=12),
+                                                    threadName="CHECKVERSION"
+                                                    )
 
         showQueueScheduler = scheduler.Scheduler(show_queue.ShowQueue(),
-                                               cycleTime=datetime.timedelta(seconds=3),
-                                               threadName="SHOWQUEUE",
-                                               silent=True)
+                                                 cycleTime=datetime.timedelta(seconds=3),
+                                                 threadName="SHOWQUEUE",
+                                                 silent=True)
 
-        searchQueueScheduler = scheduler.Scheduler(search_queue.SearchQueue(),
-                                               cycleTime=datetime.timedelta(seconds=3),
-                                               threadName="SEARCHQUEUE",
-                                               silent=True)
+        showUpdaterInstance = showUpdater.ShowUpdater()  # the interval for this is stored inside the class
+        showUpdateScheduler = scheduler.Scheduler(showUpdaterInstance,
+                                                  cycleTime=showUpdaterInstance.updateInterval,
+                                                  threadName="SHOWUPDATER",
+                                                  run_delay=showUpdaterInstance.updateInterval,
+                                                  silent=True
+                                                  )
 
-        properFinderInstance = properFinder.ProperFinder()
-        properFinderScheduler = scheduler.Scheduler(properFinderInstance,
-                                                     cycleTime=properFinderInstance.updateInterval,
-                                                     threadName="FINDPROPERS",
-                                                     runImmediately=False)
-        if not DOWNLOAD_PROPERS:
-            properFinderScheduler.silent = True
+        # searchers
+        searchQueueScheduler = scheduler.Scheduler(search_queue.SearchQueue(),
+                                                   cycleTime=datetime.timedelta(seconds=3),
+                                                   threadName="SEARCHQUEUE",
+                                                   silent=True
+                                                   )
 
-        autoPostProcesserScheduler = scheduler.Scheduler(autoPostProcesser.PostProcesser(),
-                                                     cycleTime=datetime.timedelta(minutes=10),
-                                                     threadName="POSTPROCESSER",
-                                                     runImmediately=True)
-        if not PROCESS_AUTOMATICALLY:
-            autoPostProcesserScheduler.silent = True
+        currentSearchScheduler = scheduler.Scheduler(searchCurrent.CurrentSearcher(),
+                                                     cycleTime=datetime.timedelta(minutes=SEARCH_FREQUENCY),
+                                                     threadName="SEARCH",
+                                                     run_delay=datetime.timedelta(minutes=5)
+                                                     )
 
         backlogSearchScheduler = searchBacklog.BacklogSearchScheduler(searchBacklog.BacklogSearcher(),
                                                                       cycleTime=datetime.timedelta(minutes=get_backlog_cycle_time()),
                                                                       threadName="BACKLOG",
-                                                                      runImmediately=True)
+                                                                      run_delay=datetime.timedelta(minutes=17)
+                                                                      )
+
         backlogSearchScheduler.action.cycleTime = BACKLOG_SEARCH_FREQUENCY
 
+        properFinderInstance = properFinder.ProperFinder()  # the interval for this is stored inside the class
+        properFinderScheduler = scheduler.Scheduler(properFinderInstance,
+                                                    cycleTime=properFinderInstance.updateInterval,
+                                                    threadName="FINDPROPERS",
+                                                    run_delay=properFinderInstance.updateInterval,
+                                                    silent=True
+                                                    )
+
+        # processors
+        autoPostProcesserScheduler = scheduler.Scheduler(autoPostProcesser.PostProcesser(),
+                                                         cycleTime=datetime.timedelta(minutes=10),
+                                                         threadName="POSTPROCESSER",
+                                                         run_delay=datetime.timedelta(minutes=5)
+                                                         )
+
+        if not PROCESS_AUTOMATICALLY:
+            autoPostProcesserScheduler.silent = True
+
         showList = []
         loadingShowList = {}
 
@@ -1045,6 +1065,7 @@ def save_config():
 
     new_config['XBMC'] = {}
     new_config['XBMC']['use_xbmc'] = int(USE_XBMC)
+    new_config['XBMC']['xbmc_always_on'] = int(XBMC_ALWAYS_ON)
     new_config['XBMC']['xbmc_notify_onsnatch'] = int(XBMC_NOTIFY_ONSNATCH)
     new_config['XBMC']['xbmc_notify_ondownload'] = int(XBMC_NOTIFY_ONDOWNLOAD)
     new_config['XBMC']['xbmc_update_library'] = int(XBMC_UPDATE_LIBRARY)
@@ -1111,6 +1132,9 @@ def save_config():
 
     new_config['Synology'] = {}
     new_config['Synology']['use_synoindex'] = int(USE_SYNOINDEX)
+    new_config['Synology']['synoindex_notify_onsnatch'] = int(SYNOINDEX_NOTIFY_ONSNATCH)
+    new_config['Synology']['synoindex_notify_ondownload'] = int(SYNOINDEX_NOTIFY_ONDOWNLOAD)
+    new_config['Synology']['synoindex_update_library'] = int(SYNOINDEX_UPDATE_LIBRARY)
 
     new_config['NMJv2'] = {}
     new_config['NMJv2']['use_nmjv2'] = int(USE_NMJv2)
diff --git a/sickbeard/common.py b/sickbeard/common.py
index dd91692927..da4244fb7b 100644
--- a/sickbeard/common.py
+++ b/sickbeard/common.py
@@ -29,7 +29,7 @@
                    'ogm', 'mp4', 'iso', 'img', 'divx',
                    'm2ts', 'm4v', 'ts', 'flv', 'f4v',
                    'mov', 'rmvb', 'vob', 'dvr-ms', 'wtv',
-                   'ogv', '3gp']
+                   'ogv', '3gp', 'webm']
 
 ### Other constants
 MULTI_EP_RESULT = -1
@@ -153,7 +153,7 @@ def nameQuality(name):
             return Quality.SDDVD
         elif checkName(["720p", "hdtv", "x264"], all) or checkName(["hr.ws.pdtv.x264"], any) and not checkName(["(1080)[pi]"], all):
             return Quality.HDTV
-        elif checkName(["720p|1080i", "hdtv", "mpeg-?2"], all) or checkName(["1080i.hdtv", "h.?264"], all):
+        elif checkName(["720p|1080i", "hdtv", "mpeg-?2"], all) or checkName(["1080[pi].hdtv", "h.?264"], all):
             return Quality.RAWHDTV
         elif checkName(["1080p", "hdtv", "x264"], all):
             return Quality.FULLHDTV
diff --git a/sickbeard/config.py b/sickbeard/config.py
index 89acbac676..ad0035747a 100644
--- a/sickbeard/config.py
+++ b/sickbeard/config.py
@@ -645,3 +645,10 @@ def _migrate_metadata(metadata, metadata_name, use_banner):
         sickbeard.METADATA_WDTV = _migrate_metadata(metadata_wdtv, 'WDTV', use_banner)
         sickbeard.METADATA_TIVO = _migrate_metadata(metadata_tivo, 'TIVO', use_banner)
         sickbeard.METADATA_MEDE8ER = _migrate_metadata(metadata_mede8er, 'Mede8er', use_banner)
+
+    # Migration v6: Synology notifier update
+    def _migrate_v6(self):
+        """ Updates Synology notifier to reflect that their now is an update library option instead misusing the enable option """
+
+        # clone use_synoindex to update_library since this now has notification options
+        sickbeard.SYNOINDEX_UPDATE_LIBRARY = bool(check_setting_int(self.config_obj, 'Synology', 'use_synoindex', 0))
diff --git a/sickbeard/databases/mainDB.py b/sickbeard/databases/mainDB.py
index 6d1e97bb3a..056bf2e5b7 100644
--- a/sickbeard/databases/mainDB.py
+++ b/sickbeard/databases/mainDB.py
@@ -424,7 +424,7 @@ def execute(self):
         self.incDBVersion()
 
 
-# included in build 504 (2014-03-??)
+# included in build 504 (2014-04-14)
 class AddRequireAndIgnoreWords(AddLastUpdateTVDB):
     """ Adding column rls_require_words and rls_ignore_words to tv_shows """
 
diff --git a/sickbeard/gh_api.py b/sickbeard/gh_api.py
index 1e4539bbd6..3f24dfaabb 100644
--- a/sickbeard/gh_api.py
+++ b/sickbeard/gh_api.py
@@ -21,53 +21,68 @@
 except ImportError:
     from lib import simplejson as json
 
-import helpers
-
+import helpers
+
 
 class GitHub(object):
     """
     Simple api wrapper for the Github API v3. Currently only supports the small thing that SB
-    needs it for - list of commits.
+    needs it for - list of commits.
     """
-
-    def __init__(self, github_repo_user, github_repo, branch='master'):
-
-        self.github_repo_user = github_repo_user
-        self.github_repo = github_repo
-        self.branch = branch
-
+
+    def __init__(self, github_repo_user, github_repo, branch='master'):
+
+        self.github_repo_user = github_repo_user
+        self.github_repo = github_repo
+        self.branch = branch
+
     def _access_API(self, path, params=None):
         """
         Access the API at the path given and with the optional params given.
-
+
         path: A list of the path elements to use (eg. ['repos', 'midgetspy', 'Sick-Beard', 'commits'])
         params: Optional dict of name/value pairs for extra params to send. (eg. {'per_page': 10})
-
+
         Returns a deserialized json object of the result. Doesn't do any error checking (hope it works).
         """
-
+
         url = 'https://api.github.com/' + '/'.join(path)
-
+
         if params and type(params) is dict:
             url += '?' + '&'.join([str(x) + '=' + str(params[x]) for x in params.keys()])
-
-        data = helpers.getURL(url)
-
-        if data:
-            json_data = json.loads(data)
-            return json_data
-        else:
-            return []
-
-    def commits(self):
+
+        data = helpers.getURL(url)
+
+        if data:
+            json_data = json.loads(data)
+            return json_data
+        else:
+            return []
+
+    def commits(self):
         """
         Uses the API to get a list of the 100 most recent commits from the specified user/repo/branch, starting from HEAD.
-
+
         user: The github username of the person whose repo you're querying
         repo: The repo name to query
         branch: Optional, the branch name to show commits from
-
+
         Returns a deserialized json object containing the commit info. See http://developer.github.com/v3/repos/commits/
         """
-        access_API = self._access_API(['repos', self.github_repo_user, self.github_repo, 'commits'], {'per_page': 100, 'sha': self.branch})
-        return access_API
+        access_API = self._access_API(['repos', self.github_repo_user, self.github_repo, 'commits'], params={'per_page': 100, 'sha': self.branch})
+        return access_API
+
+    def compare(self, base, head, per_page=1):
+        """
+        Uses the API to get a list of compares between base and head.
+
+        user: The github username of the person whose repo you're querying
+        repo: The repo name to query
+        base: Start compare from branch
+        head: Current commit sha or branch name to compare
+        per_page: number of items per page
+
+        Returns a deserialized json object containing the compare info. See http://developer.github.com/v3/repos/commits/
+        """
+        access_API = self._access_API(['repos', self.github_repo_user, self.github_repo, 'compare', base + '...' + head], params={'per_page': per_page})
+        return access_API
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
index d63f150e74..db9cb7348d 100644
--- a/sickbeard/helpers.py
+++ b/sickbeard/helpers.py
@@ -50,6 +50,7 @@
 from sickbeard.exceptions import MultipleShowObjectsException, ex
 from sickbeard import logger, classes
 from sickbeard.common import USER_AGENT, mediaExtensions, XML_NSMAP
+from sickbeard.common import mediaExtensions
 
 from sickbeard import db
 from sickbeard import encodingKludge as ek
@@ -82,6 +83,32 @@ def indentXML(elem, level=0):
             elem.tail = i
 
 
+def remove_extension(name):
+    """
+    Remove download or media extension from name (if any)
+    """
+
+    if name and "." in name:
+        base_name, sep, extension = name.rpartition('.')  # @UnusedVariable
+        if base_name and extension.lower() in ['nzb', 'torrent'] + mediaExtensions:
+            name = base_name
+
+    return name
+
+
+def remove_non_release_groups(name):
+    """
+    Remove non release groups from name
+    """
+
+    if name and "-" in name:
+        name_group = name.rsplit('-', 1)
+        if name_group[-1].upper() in ["RP", "NZBGEEK"]:
+            name = name_group[0]
+
+    return name
+
+
 def replaceExtension(filename, newExt):
     '''
     >>> replaceExtension('foo.avi', 'mkv')
diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py
index 20ffdb7cb8..3bfac589fd 100644
--- a/sickbeard/name_parser/parser.py
+++ b/sickbeard/name_parser/parser.py
@@ -25,31 +25,35 @@
 import sickbeard
 
 from sickbeard import logger
+from sickbeard import encodingKludge as ek
+from sickbeard import helpers
+
+
 
 class NameParser(object):
-    def __init__(self, file_name=True):
+    def __init__(self, is_file_name=True):
 
-        self.file_name = file_name
+        self.is_file_name = is_file_name
         self.compiled_regexes = []
         self._compile_regexes()
 
     def clean_series_name(self, series_name):
         """Cleans up series name by removing any . and _
         characters, along with any trailing hyphens.
-    
+
         Is basically equivalent to replacing all _ and . with a
         space, but handles decimal numbers in string, for example:
-    
+
         >>> cleanRegexedSeriesName("an.example.1.0.test")
         'an example 1.0 test'
         >>> cleanRegexedSeriesName("an_example_1.0_test")
         'an example 1.0 test'
-        
+
         Stolen from dbr's tvnamer
         """
-        
+
         series_name = re.sub("(\D)\.(?!\s)(\D)", "\\1 \\2", series_name)
-        series_name = re.sub("(\d)\.(\d{4})", "\\1 \\2", series_name) # if it ends in a year then don't keep the dot
+        series_name = re.sub("(\d)\.(\d{4})", "\\1 \\2", series_name)  # if it ends in a year then don't keep the dot
         series_name = re.sub("(\D)\.(?!\s)", "\\1 ", series_name)
         series_name = re.sub("\.(?!\s)(\D)", " \\1", series_name)
         series_name = series_name.replace("_", " ")
@@ -66,36 +70,36 @@ def _compile_regexes(self):
                 self.compiled_regexes.append((cur_pattern_name, cur_regex))
 
     def _parse_string(self, name):
-        
+
         if not name:
             return None
-        
+
         for (cur_regex_name, cur_regex) in self.compiled_regexes:
             match = cur_regex.match(name)
 
             if not match:
                 continue
-            
+
             result = ParseResult(name)
             result.which_regex = [cur_regex_name]
-            
+
             named_groups = match.groupdict().keys()
 
             if 'series_name' in named_groups:
                 result.series_name = match.group('series_name')
                 if result.series_name:
                     result.series_name = self.clean_series_name(result.series_name)
-            
+
             if 'season_num' in named_groups:
                 tmp_season = int(match.group('season_num'))
-                if cur_regex_name == 'bare' and tmp_season in (19,20):
+                if cur_regex_name == 'bare' and tmp_season in (19, 20):
                     continue
                 result.season_number = tmp_season
-            
+
             if 'ep_num' in named_groups:
                 ep_num = self._convert_number(match.group('ep_num'))
                 if 'extra_ep_num' in named_groups and match.group('extra_ep_num'):
-                    result.episode_numbers = range(ep_num, self._convert_number(match.group('extra_ep_num'))+1)
+                    result.episode_numbers = range(ep_num, self._convert_number(match.group('extra_ep_num')) + 1)
                 else:
                     result.episode_numbers = [ep_num]
 
@@ -103,7 +107,7 @@ def _parse_string(self, name):
                 year = int(match.group('air_year'))
                 month = int(match.group('air_month'))
                 day = int(match.group('air_day'))
-                
+
                 # make an attempt to detect YYYY-DD-MM formats
                 if month > 12:
                     tmp_month = month
@@ -125,8 +129,8 @@ def _parse_string(self, name):
                 if tmp_extra_info:
                     result.is_proper = re.search('(^|[\. _-])(proper|repack)([\. _-]|$)', tmp_extra_info, re.I) is not None
 
-                # Show.S04.Special is almost certainly not every episode in the season
-                if tmp_extra_info and cur_regex_name == 'season_only' and re.match(r'([. _-]|^)(special|extra)\w*([. _-]|$)', tmp_extra_info, re.I):
+                # Show.S04.Special or Show.S05.Part.2.Extras is almost certainly not every episode in the season
+                if tmp_extra_info and cur_regex_name == 'season_only' and re.search(r'([. _-]|^)(special|extra)s?\w*([. _-]|$)', tmp_extra_info, re.I):
                     continue
                 result.extra_info = tmp_extra_info
 
@@ -148,10 +152,10 @@ def _combine_results(self, first, second, attr):
         # if the second doesn't exist then return the first
         if not second:
             return getattr(first, attr)
-        
+
         a = getattr(first, attr)
         b = getattr(second, attr)
-        
+
         # if a is good use it
         if a != None or (type(a) == list and len(a)):
             return a
@@ -159,74 +163,70 @@ def _combine_results(self, first, second, attr):
         else:
             return b
 
-    def _unicodify(self, obj, encoding = "utf-8"):
+    def _unicodify(self, obj, encoding="utf-8"):
         if isinstance(obj, basestring):
             if not isinstance(obj, unicode):
                 obj = unicode(obj, encoding)
         return obj
 
-    def _convert_number(self, number):
-        if type(number) == int:
-            return number
-
-        # good lord I'm lazy
-        if number.lower() == 'i': return 1
-        if number.lower() == 'ii': return 2
-        if number.lower() == 'iii': return 3
-        if number.lower() == 'iv': return 4
-        if number.lower() == 'v': return 5
-        if number.lower() == 'vi': return 6
-        if number.lower() == 'vii': return 7
-        if number.lower() == 'viii': return 8
-        if number.lower() == 'ix': return 9
-        if number.lower() == 'x': return 10
-        if number.lower() == 'xi': return 11
-        if number.lower() == 'xii': return 12
-        if number.lower() == 'xiii': return 13
-        if number.lower() == 'xiv': return 14
-        if number.lower() == 'xv': return 15
-        if number.lower() == 'xvi': return 16
-        if number.lower() == 'xvii': return 17
-        if number.lower() == 'xviii': return 18
-        if number.lower() == 'xix': return 19
-        if number.lower() == 'xx': return 20
-        if number.lower() == 'xxi': return 21
-        if number.lower() == 'xxii': return 22
-        if number.lower() == 'xxiii': return 23
-        if number.lower() == 'xxiv': return 24
-        if number.lower() == 'xxv': return 25
-        if number.lower() == 'xxvi': return 26
-        if number.lower() == 'xxvii': return 27
-        if number.lower() == 'xxviii': return 28
-        if number.lower() == 'xxix': return 29
-
-        return int(number)
+    def _convert_number(self, org_number):
+        """
+        Convert org_number into an integer
+        org_number: integer or representation of a number: string or unicode
+        Try force converting to int first, on error try converting from Roman numerals
+        returns integer or 0
+        """
+
+        try:
+            # try forcing to int
+            if org_number:
+                number = int(org_number)
+            else:
+                number = 0
+
+        except:
+            # on error try converting from Roman numerals
+            roman_to_int_map = (('M', 1000), ('CM', 900), ('D', 500), ('CD', 400), ('C', 100),
+                                ('XC', 90), ('L', 50), ('XL', 40), ('X', 10),
+                                ('IX', 9), ('V', 5), ('IV', 4), ('I', 1)
+                               )
+
+            roman_numeral = str(org_number).upper()
+            number = 0
+            index = 0
+
+            for numeral, integer in roman_to_int_map:
+                while roman_numeral[index:index + len(numeral)] == numeral:
+                    number += integer
+                    index += len(numeral)
+
+        return number
 
     def parse(self, name):
-        
+
         name = self._unicodify(name)
-        
+
         cached = name_parser_cache.get(name)
         if cached:
             return cached
 
         # break it into parts if there are any (dirname, file name, extension)
-        dir_name, file_name = os.path.split(name)
-        ext_match = re.match('(.*)\.\w{3,4}$', file_name)
-        if ext_match and self.file_name:
-            base_file_name = ext_match.group(1)
+        dir_name, file_name = ek.ek(os.path.split, name)
+
+        if self.is_file_name:
+            base_file_name = helpers.remove_extension(file_name)
         else:
             base_file_name = file_name
-        
+
         # use only the direct parent dir
-        dir_name = os.path.basename(dir_name)
-        
+        dir_name = ek.ek(os.path.basename, dir_name)
+
         # set up a result to use
         final_result = ParseResult(name)
-        
+
         # try parsing the file name
         file_name_result = self._parse_string(base_file_name)
-        
+
         # parse the dirname for extra info if needed
         dir_name_result = self._parse_string(dir_name)
 
@@ -263,6 +263,7 @@ def parse(self, name):
         # return it
         return final_result
 
+
 class ParseResult(object):
     def __init__(self,
                  original_name,
@@ -275,7 +276,7 @@ def __init__(self,
                  ):
 
         self.original_name = original_name
-        
+
         self.series_name = series_name
         self.season_number = season_number
         if not episode_numbers:
@@ -285,15 +286,15 @@ def __init__(self,
 
         self.extra_info = extra_info
         self.release_group = release_group
-        
+
         self.air_date = air_date
-        
+
         self.which_regex = None
-        
+
     def __eq__(self, other):
         if not other:
             return False
-        
+
         if self.series_name != other.series_name:
             return False
         if self.season_number != other.season_number:
@@ -306,7 +307,7 @@ def __eq__(self, other):
             return False
         if self.air_date != other.air_date:
             return False
-        
+
         return True
 
     def __str__(self):
@@ -315,10 +316,10 @@ def __str__(self):
         else:
             to_return = u''
         if self.season_number != None:
-            to_return += 'S'+str(self.season_number)
+            to_return += 'S' + str(self.season_number)
         if self.episode_numbers and len(self.episode_numbers):
             for e in self.episode_numbers:
-                to_return += 'E'+str(e)
+                to_return += 'E' + str(e)
 
         if self.air_by_date:
             to_return += str(self.air_date)
@@ -328,7 +329,7 @@ def __str__(self):
         if self.release_group:
             to_return += ' (' + self.release_group + ')'
 
-        to_return += ' [ABD: '+str(self.air_by_date)+']'
+        to_return += ' [ABD: ' + str(self.air_by_date) + ']'
 
         return to_return.encode('utf-8')
 
@@ -338,19 +339,20 @@ def _is_air_by_date(self):
         return False
     air_by_date = property(_is_air_by_date)
 
+
 class NameParserCache(object):
     #TODO: check if the fifo list can beskiped and only use one dict
-    _previous_parsed_list = [] # keep a fifo list of the cached items
+    _previous_parsed_list = []  # keep a fifo list of the cached items
     _previous_parsed = {}
     _cache_size = 100
-    
+
     def add(self, name, parse_result):
         self._previous_parsed[name] = parse_result
         self._previous_parsed_list.append(name)
         while len(self._previous_parsed_list) > self._cache_size:
             del_me = self._previous_parsed_list.pop(0)
             self._previous_parsed.pop(del_me)
-    
+
     def get(self, name):
         if name in self._previous_parsed:
             logger.log("Using cached parse result for: " + name, logger.DEBUG)
@@ -360,5 +362,6 @@ def get(self, name):
 
 name_parser_cache = NameParserCache()
 
+
 class InvalidNameException(Exception):
     "The given name is not valid"
diff --git a/sickbeard/notifiers/__init__.py b/sickbeard/notifiers/__init__.py
index 13b62cde79..c65d7c4293 100755
--- a/sickbeard/notifiers/__init__.py
+++ b/sickbeard/notifiers/__init__.py
@@ -36,13 +36,15 @@
 import trakt
 
 from sickbeard.common import *
+from sickbeard import logger
+from sickbeard.exceptions import ex
 
-# home theater
+# home theater/nas
 xbmc_notifier = xbmc.XBMCNotifier()
 plex_notifier = plex.PLEXNotifier()
 nmj_notifier = nmj.NMJNotifier()
-synoindex_notifier = synoindex.synoIndexNotifier()
 nmjv2_notifier = nmjv2.NMJv2Notifier()
+synoindex_notifier = synoindex.synoIndexNotifier()
 pytivo_notifier = pytivo.pyTivoNotifier()
 # devices
 growl_notifier = growl.GrowlNotifier()
@@ -51,12 +53,12 @@
 pushover_notifier = pushover.PushoverNotifier()
 boxcar_notifier = boxcar.BoxcarNotifier()
 nma_notifier = nma.NMA_Notifier()
-# online
+# social
 twitter_notifier = tweet.TwitterNotifier()
 trakt_notifier = trakt.TraktNotifier()
 
 notifiers = [
-    libnotify_notifier, # Libnotify notifier goes first because it doesn't involve blocking on network activity.
+    libnotify_notifier,  # Libnotify notifier goes first because it doesn't involve blocking on network activity.
     xbmc_notifier,
     plex_notifier,
     nmj_notifier,
@@ -75,9 +77,23 @@
 
 def notify_download(ep_name):
     for n in notifiers:
-        n.notify_download(ep_name)
+        try:
+            n.notify_download(ep_name)
+        except Exception, e:
+            logger.log(n.__class__.__name__ + ": " + ex(e), logger.ERROR)
 
 
 def notify_snatch(ep_name):
     for n in notifiers:
-        n.notify_snatch(ep_name)
+        try:
+            n.notify_snatch(ep_name)
+        except Exception, e:
+            logger.log(n.__class__.__name__ + ": " + ex(e), logger.ERROR)
+
+
+def update_library(ep_obj):
+    for n in notifiers:
+        try:
+            n.update_library(ep_obj=ep_obj)
+        except Exception, e:
+            logger.log(n.__class__.__name__ + ": " + ex(e), logger.ERROR)
diff --git a/sickbeard/notifiers/boxcar.py b/sickbeard/notifiers/boxcar.py
index 35a86942de..315a4f5916 100644
--- a/sickbeard/notifiers/boxcar.py
+++ b/sickbeard/notifiers/boxcar.py
@@ -17,7 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib, urllib2
+import urllib
+import urllib2
 import time
 
 import sickbeard
@@ -28,23 +29,21 @@
 
 API_URL = "https://boxcar.io/devices/providers/fWc4sgSmpcN6JujtBmR6/notifications"
 
-class BoxcarNotifier:
 
-    def test_notify(self, email, title="Test"):
-        return self._sendBoxcar("This is a test notification from SickBeard", title, email)
+class BoxcarNotifier:
 
     def _sendBoxcar(self, msg, title, email, subscribe=False):
         """
         Sends a boxcar notification to the address provided
-        
+
         msg: The message to send (unicode)
         title: The title of the message
         email: The email address to send the message to (or to subscribe with)
         subscribe: If true then instead of sending a message this function will send a subscription notification (optional, default is False)
-        
+
         returns: True if the message succeeded, False otherwise
         """
-        
+
         # build up the URL and parameters
         msg = msg.strip()
         curUrl = API_URL
@@ -53,7 +52,7 @@ def _sendBoxcar(self, msg, title, email, subscribe=False):
         if subscribe:
             data = urllib.urlencode({'email': email})
             curUrl = curUrl + "/subscribe"
-        
+
         # for normal requests we need all these parameters
         else:
             data = urllib.urlencode({
@@ -63,63 +62,53 @@ def _sendBoxcar(self, msg, title, email, subscribe=False):
                 'notification[from_remote_service_id]': int(time.time())
                 })
 
-
         # send the request to boxcar
         try:
             req = urllib2.Request(curUrl)
             handle = urllib2.urlopen(req, data)
             handle.close()
-            
+
         except urllib2.URLError, e:
             # if we get an error back that doesn't have an error code then who knows what's really happening
             if not hasattr(e, 'code'):
-                logger.log("Boxcar notification failed." + ex(e), logger.ERROR)
+                logger.log(u"BOXCAR: Notification failed." + ex(e), logger.ERROR)
                 return False
             else:
-                logger.log("Boxcar notification failed. Error code: " + str(e.code), logger.WARNING)
+                logger.log(u"BOXCAR: Notification failed. Error code: " + str(e.code), logger.ERROR)
 
             # HTTP status 404 if the provided email address isn't a Boxcar user.
             if e.code == 404:
-                logger.log("Username is wrong/not a boxcar email. Boxcar will send an email to it", logger.WARNING)
+                logger.log(u"BOXCAR: Username is wrong/not a boxcar email. Boxcar will send an email to it", logger.WARNING)
                 return False
-            
+
             # For HTTP status code 401's, it is because you are passing in either an invalid token, or the user has not added your service.
             elif e.code == 401:
-                
+
                 # If the user has already added your service, we'll return an HTTP status code of 401.
                 if subscribe:
-                    logger.log("Already subscribed to service", logger.ERROR)
+                    logger.log(u"BOXCAR: Already subscribed to service", logger.ERROR)
                     # i dont know if this is true or false ... its neither but i also dont know how we got here in the first place
                     return False
-                
-                #HTTP status 401 if the user doesn't have the service added
+
+                # HTTP status 401 if the user doesn't have the service added
                 else:
                     subscribeNote = self._sendBoxcar(msg, title, email, True)
                     if subscribeNote:
-                        logger.log("Subscription send", logger.DEBUG)
+                        logger.log(u"BOXCAR: Subscription sent.", logger.DEBUG)
                         return True
                     else:
-                        logger.log("Subscription could not be send", logger.ERROR)
+                        logger.log(u"BOXCAR: Subscription could not be sent.", logger.ERROR)
                         return False
-            
+
             # If you receive an HTTP status code of 400, it is because you failed to send the proper parameters
             elif e.code == 400:
-                logger.log("Wrong data send to boxcar", logger.ERROR)
+                logger.log(u"BOXCAR: Wrong data sent to boxcar.", logger.ERROR)
                 return False
 
-        logger.log("Boxcar notification successful.", logger.DEBUG)
+        logger.log(u"BOXCAR: Notification successful.", logger.MESSAGE)
         return True
 
-    def notify_snatch(self, ep_name, title=notifyStrings[NOTIFY_SNATCH]):
-        if sickbeard.BOXCAR_NOTIFY_ONSNATCH:
-            self._notifyBoxcar(title, ep_name)
-            
-
-    def notify_download(self, ep_name, title=notifyStrings[NOTIFY_DOWNLOAD]):
-        if sickbeard.BOXCAR_NOTIFY_ONDOWNLOAD:
-            self._notifyBoxcar(title, ep_name)
-
-    def _notifyBoxcar(self, title, message, username=None, force=False):
+    def _notify(self, title, message, username=None, force=False):
         """
         Sends a boxcar notification based on the provided info or SB config
 
@@ -129,17 +118,34 @@ def _notifyBoxcar(self, title, message, username=None, force=False):
         force: If True then the notification will be sent even if Boxcar is disabled in the config
         """
 
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_BOXCAR and not force:
-            logger.log("Notification for Boxcar not enabled, skipping this notification", logger.DEBUG)
             return False
 
         # if no username was given then use the one from the config
         if not username:
             username = sickbeard.BOXCAR_USERNAME
 
-        logger.log("Sending notification for " + message, logger.DEBUG)
+        logger.log(u"BOXCAR: Sending notification for " + message, logger.DEBUG)
 
-        self._sendBoxcar(message, title, username)
-        return True
+        return self._sendBoxcar(message, title, username)
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.BOXCAR_NOTIFY_ONSNATCH:
+            self._notify(notifyStrings[NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.BOXCAR_NOTIFY_ONDOWNLOAD:
+            self._notify(notifyStrings[NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self, boxcar_username):
+        return self._notify("This is a test notification from Sick Beard", "Test", boxcar_username, force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
 
 notifier = BoxcarNotifier
diff --git a/sickbeard/notifiers/growl.py b/sickbeard/notifiers/growl.py
index 72577489b9..e2b09b73ba 100644
--- a/sickbeard/notifiers/growl.py
+++ b/sickbeard/notifiers/growl.py
@@ -17,7 +17,6 @@
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
 import socket
-
 import sickbeard
 
 from sickbeard import logger, common
@@ -25,153 +24,166 @@
 
 from lib.growl import gntp
 
-class GrowlNotifier:
-
-    def test_notify(self, host, password):
-        self._sendRegistration(host, password, 'Test')
-        return self._sendGrowl("Test Growl", "Testing Growl settings from Sick Beard", "Test", host, password, force=True)
-
-    def notify_snatch(self, ep_name):
-        if sickbeard.GROWL_NOTIFY_ONSNATCH:
-            self._sendGrowl(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
 
-    def notify_download(self, ep_name):
-        if sickbeard.GROWL_NOTIFY_ONDOWNLOAD:
-            self._sendGrowl(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
+class GrowlNotifier:
 
-    def _send_growl(self, options,message=None):
-                
-        #Send Notification
+    def _send_growl(self, options, message=None):
+        # send notification
         notice = gntp.GNTPNotice()
-    
+
         #Required
-        notice.add_header('Application-Name',options['app'])
-        notice.add_header('Notification-Name',options['name'])
-        notice.add_header('Notification-Title',options['title'])
-    
+        notice.add_header('Application-Name', options['app'])
+        notice.add_header('Notification-Name', options['name'])
+        notice.add_header('Notification-Title', options['title'])
+
         if options['password']:
             notice.set_password(options['password'])
-    
-        #Optional
+
+        # optional
         if options['sticky']:
-            notice.add_header('Notification-Sticky',options['sticky'])
+            notice.add_header('Notification-Sticky', options['sticky'])
         if options['priority']:
-            notice.add_header('Notification-Priority',options['priority'])
+            notice.add_header('Notification-Priority', options['priority'])
         if options['icon']:
-            notice.add_header('Notification-Icon', 'https://raw.github.com/midgetspy/Sick-Beard/master/data/images/sickbeard.png')
-    
+            notice.add_header('Notification-Icon', 'http://www.sickbeard.com/notify.png')
+
         if message:
-            notice.add_header('Notification-Text',message)
+            notice.add_header('Notification-Text', message)
+
+        response = self._send(options['host'], options['port'], notice.encode(), options['debug'])
+        if isinstance(response, gntp.GNTPOK):
+            return True
 
-        response = self._send(options['host'],options['port'],notice.encode(),options['debug'])
-        if isinstance(response,gntp.GNTPOK): return True
         return False
 
-    def _send(self, host,port,data,debug=False):
-        if debug: print '<Sending>\n',data,'\n</Sending>'
-        
+    def _send(self, host, port, data, debug=False):
+        if debug:
+            print '<Sending>\n', data, '\n</Sending>'
+
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.connect((host,port))
+        s.connect((host, port))
         s.send(data)
         response = gntp.parse_gntp(s.recv(1024))
         s.close()
-    
-        if debug: print '<Recieved>\n',response,'\n</Recieved>'
+
+        if debug:
+            print '<Recieved>\n', response, '\n</Recieved>'
 
         return response
 
-    def _sendGrowl(self, title="Sick Beard Notification", message=None, name=None, host=None, password=None, force=False):
+    def _notify(self, title="Sick Beard Notification", message=None, name=None, host=None, password=None, force=False):
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_GROWL and not force:
             return False
-    
-        if name == None:
+
+        # fill in omitted parameters
+        if not name:
             name = title
-    
-        if host == None:
+
+        if not host:
             hostParts = sickbeard.GROWL_HOST.split(':')
         else:
             hostParts = host.split(':')
-    
+
         if len(hostParts) != 2 or hostParts[1] == '':
             port = 23053
         else:
             port = int(hostParts[1])
-    
-        growlHosts = [(hostParts[0],port)]
-    
+
+        growlHosts = [(hostParts[0], port)]
+
         opts = {}
-    
+
         opts['name'] = name
-    
+
         opts['title'] = title
         opts['app'] = 'SickBeard'
-    
+
         opts['sticky'] = None
         opts['priority'] = None
         opts['debug'] = False
-    
-        if password == None:
+
+        if not password:
             opts['password'] = sickbeard.GROWL_PASSWORD
         else:
             opts['password'] = password
-    
+
         opts['icon'] = True
-    
-    
+
+        # TODO: Multi hosts does not seem to work... registration only happens for the first
         for pc in growlHosts:
+            print pc
             opts['host'] = pc[0]
             opts['port'] = pc[1]
-            logger.log(u"Sending growl to "+opts['host']+":"+str(opts['port'])+": "+message)
+            logger.log(u"GROWL: Sending message '" + message + "' to " + opts['host'] + ":" + str(opts['port']), logger.DEBUG)
             try:
                 return self._send_growl(opts, message)
-            except socket.error, e:
-                logger.log(u"Unable to send growl to "+opts['host']+":"+str(opts['port'])+": "+ex(e))
+            except Exception, e:
+                logger.log(u"GROWL: Unable to send growl to " + opts['host'] + ":" + str(opts['port']) + " - " + ex(e), logger.WARNING)
                 return False
 
-    def _sendRegistration(self, host=None, password=None, name='Sick Beard Notification'):
+    def _sendRegistration(self, host=None, password=None, name="Sick Beard Notification"):
         opts = {}
-    
-        if host == None:
+
+        if not host:
             hostParts = sickbeard.GROWL_HOST.split(':')
         else:
             hostParts = host.split(':')
-    
+
         if len(hostParts) != 2 or hostParts[1] == '':
             port = 23053
         else:
             port = int(hostParts[1])
-            
+
         opts['host'] = hostParts[0]
         opts['port'] = port
-        
-            
-        if password == None:
+
+        if not password:
             opts['password'] = sickbeard.GROWL_PASSWORD
         else:
             opts['password'] = password
-    
-        
+
         opts['app'] = 'SickBeard'
         opts['debug'] = False
-        
-        #Send Registration
+
+        # send registration
         register = gntp.GNTPRegister()
         register.add_header('Application-Name', opts['app'])
-        register.add_header('Application-Icon', 'https://raw.github.com/midgetspy/Sick-Beard/master/data/images/sickbeard.png')
-        
+        register.add_header('Application-Icon', 'http://www.sickbeard.com/notify.png')
+
         register.add_notification('Test', True)
         register.add_notification(common.notifyStrings[common.NOTIFY_SNATCH], True)
         register.add_notification(common.notifyStrings[common.NOTIFY_DOWNLOAD], True)
 
         if opts['password']:
             register.set_password(opts['password'])
-        
+
         try:
-            return self._send(opts['host'],opts['port'],register.encode(),opts['debug'])
-        except socket.error, e:
-            logger.log(u"Unable to send growl to "+opts['host']+":"+str(opts['port'])+": "+str(e).decode('utf-8'))
+            return self._send(opts['host'], opts['port'], register.encode(), opts['debug'])
+        except Exception, e:
+            logger.log(u"GROWL: Unable to send growl to " + opts['host'] + ":" + str(opts['port']) + " - " + ex(e), logger.WARNING)
             return False
-        
-    
-    
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.GROWL_NOTIFY_ONSNATCH:
+            self._notify(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.GROWL_NOTIFY_ONDOWNLOAD:
+            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self, host, password):
+        result = self._sendRegistration(host, password, "Test")
+        if result:
+            return self._notify("Test Growl", "Testing Growl settings from Sick Beard", "Test", host, password, force=True)
+        else:
+            return result
+
+    def update_library(self, ep_obj=None):
+        pass
+
 notifier = GrowlNotifier
diff --git a/sickbeard/notifiers/libnotify.py b/sickbeard/notifiers/libnotify.py
index a95f7d9dee..2071c07472 100644
--- a/sickbeard/notifiers/libnotify.py
+++ b/sickbeard/notifiers/libnotify.py
@@ -22,13 +22,14 @@
 
 from sickbeard import logger, common
 
+
 def diagnose():
     '''
     Check the environment for reasons libnotify isn't working.  Return a
     user-readable message indicating possible issues.
     '''
     try:
-        import pynotify  #@UnusedImport
+        import pynotify  # @UnusedImport
     except ImportError:
         return (u"<p>Error: pynotify isn't installed.  On Ubuntu/Debian, install the "
                 u"<a href=\"apt:python-notify\">python-notify</a> package.")
@@ -66,41 +67,33 @@ def init_pynotify(self):
         try:
             import pynotify
         except ImportError:
-            logger.log(u"Unable to import pynotify. libnotify notifications won't work.")
+            logger.log(u"LIBNOTIFY: Unable to import pynotify. libnotify notifications won't work.", logger.ERROR)
             return False
         try:
             import gobject
         except ImportError:
-            logger.log(u"Unable to import gobject. We can't catch a GError in display.")
+            logger.log(u"LIBNOTIFY: Unable to import gobject. We can't catch a GError in display.", logger.ERROR)
             return False
         if not pynotify.init('Sick Beard'):
-            logger.log(u"Initialization of pynotify failed. libnotify notifications won't work.")
+            logger.log(u"LIBNOTIFY: Initialization of pynotify failed. libnotify notifications won't work.", logger.ERROR)
             return False
         self.pynotify = pynotify
         self.gobject = gobject
         return True
 
-    def notify_snatch(self, ep_name):
-        if sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH:
-            self._notify(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
-
-    def notify_download(self, ep_name):
-        if sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD:
-            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
-
-    def test_notify(self):
-        return self._notify('Test notification', "This is a test notification from Sick Beard", force=True)
-
     def _notify(self, title, message, force=False):
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_LIBNOTIFY and not force:
             return False
+
+        # detect if we can use pynotify
         if not self.init_pynotify():
             return False
 
         # Can't make this a global constant because PROG_DIR isn't available
         # when the module is imported.
         icon_path = os.path.join(sickbeard.PROG_DIR, "data/images/sickbeard_touch_icon.png")
-        icon_uri = 'file://' + os.path.abspath(icon_path)
+        icon_uri = "file://" + os.path.abspath(icon_path)
 
         # If the session bus can't be acquired here a bunch of warning messages
         # will be printed but the call to show() will still return True.
@@ -111,4 +104,22 @@ def _notify(self, title, message, force=False):
         except self.gobject.GError:
             return False
 
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH:
+            self._notify(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.LIBNOTIFY_NOTIFY_ONDOWNLOAD:
+            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self):
+        return self._notify("Test notification", "This is a test notification from Sick Beard", force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
+
 notifier = LibnotifyNotifier
diff --git a/sickbeard/notifiers/nma.py b/sickbeard/notifiers/nma.py
index a85212715b..84c6f73875 100644
--- a/sickbeard/notifiers/nma.py
+++ b/sickbeard/notifiers/nma.py
@@ -1,52 +1,78 @@
+# Author: Adam Landry
+# URL: http://code.google.com/p/sickbeard/
+#
+# This file is part of Sick Beard.
+#
+# Sick Beard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Sick Beard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
+
 import sickbeard
 
 from sickbeard import logger, common
 from lib.pynma import pynma
 
-class NMA_Notifier:
-    
-    def test_notify(self, nma_api, nma_priority):
-        return self._sendNMA(nma_api, nma_priority, event="Test", message="Testing NMA settings from Sick Beard", force=True)
 
-    def notify_snatch(self, ep_name):
-        if sickbeard.NMA_NOTIFY_ONSNATCH:
-            self._sendNMA(nma_api=None, nma_priority=None, event=common.notifyStrings[common.NOTIFY_SNATCH], message=ep_name)
+class NMA_Notifier:
 
-    def notify_download(self, ep_name):
-        if sickbeard.NMA_NOTIFY_ONDOWNLOAD:
-            self._sendNMA(nma_api=None, nma_priority=None, event=common.notifyStrings[common.NOTIFY_DOWNLOAD], message=ep_name)
-        
     def _sendNMA(self, nma_api=None, nma_priority=None, event=None, message=None, force=False):
-    
-        title = 'Sick-Beard'
-    
+
+        title = "Sick Beard"
+
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_NMA and not force:
             return False
-        
+
         if nma_api == None:
             nma_api = sickbeard.NMA_API
-            
+
         if nma_priority == None:
             nma_priority = sickbeard.NMA_PRIORITY
-    
-        logger.log(u"NMA title: " + title, logger.DEBUG)
-        logger.log(u"NMA event: " + event, logger.DEBUG)
-        logger.log(u"NMA message: " + message, logger.DEBUG)
-        
+
         batch = False
-        
+
         p = pynma.PyNMA()
         keys = nma_api.split(',')
         p.addkey(keys)
-        
-        if len(keys) > 1: batch = True
-        
+
+        if len(keys) > 1:
+            batch = True
+
+        logger.log("NMA: Sending notice with details: event=\"%s\", message=\"%s\", priority=%s, batch=%s" % (event, message, nma_priority, batch), logger.DEBUG)
         response = p.push(title, event, message, priority=nma_priority, batch_mode=batch)
-               
+
         if not response[nma_api][u'code'] == u'200':
-            logger.log(u'Could not send notification to NotifyMyAndroid', logger.ERROR)
+            logger.log(u"NMA: Could not send notification to NotifyMyAndroid", logger.ERROR)
             return False
         else:
+            logger.log(u"NMA: Notification sent to NotifyMyAndroid", logger.MESSAGE)
             return True
-                        
-notifier = NMA_Notifier
\ No newline at end of file
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.NMA_NOTIFY_ONSNATCH:
+            self._sendNMA(nma_api=None, nma_priority=None, event=common.notifyStrings[common.NOTIFY_SNATCH], message=ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.NMA_NOTIFY_ONDOWNLOAD:
+            self._sendNMA(nma_api=None, nma_priority=None, event=common.notifyStrings[common.NOTIFY_DOWNLOAD], message=ep_name)
+
+    def test_notify(self, nma_api, nma_priority):
+        return self._sendNMA(nma_api, nma_priority, event="Test", message="Testing NMA settings from Sick Beard", force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
+
+notifier = NMA_Notifier
diff --git a/sickbeard/notifiers/nmj.py b/sickbeard/notifiers/nmj.py
index 4a05815592..8c142ada81 100644
--- a/sickbeard/notifiers/nmj.py
+++ b/sickbeard/notifiers/nmj.py
@@ -16,12 +16,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib, urllib2
+import urllib
+import urllib2
 import sickbeard
 import telnetlib
 import re
 
 from sickbeard import logger
+from sickbeard.exceptions import ex
 
 try:
     import xml.etree.cElementTree as etree
@@ -32,23 +34,23 @@
 class NMJNotifier:
     def notify_settings(self, host):
         """
-        Retrieves the settings from a NMJ/Popcorn hour
-        
+        Retrieves the settings from a NMJ/Popcorn Hour
+
         host: The hostname/IP of the Popcorn Hour server
-        
+
         Returns: True if the settings were retrieved successfully, False otherwise
         """
-        
+
         # establish a terminal session to the PC
         terminal = False
         try:
             terminal = telnetlib.Telnet(host)
         except Exception:
-            logger.log(u"Warning: unable to get a telnet session to %s" % (host), logger.ERROR)
+            logger.log(u"NMJ: Unable to get a telnet session to %s" % (host), logger.WARNING)
             return False
 
         # tell the terminal to output the necessary info to the screen so we can search it later
-        logger.log(u"Connected to %s via telnet" % (host), logger.DEBUG)
+        logger.log(u"NMJ: Connected to %s via telnet" % (host), logger.DEBUG)
         terminal.read_until("sh-3.00# ")
         terminal.write("cat /tmp/source\n")
         terminal.write("cat /tmp/netshare\n")
@@ -63,56 +65,51 @@ def notify_settings(self, host):
         if match:
             database = match.group(1)
             device = match.group(2)
-            logger.log(u"Found NMJ database %s on device %s" % (database, device), logger.DEBUG)
+            logger.log(u"NMJ: Found NMJ database %s on device %s" % (database, device), logger.DEBUG)
             sickbeard.NMJ_DATABASE = database
         else:
-            logger.log(u"Could not get current NMJ database on %s, NMJ is probably not running!" % (host), logger.ERROR)
+            logger.log(u"NMJ: Could not get current NMJ database on %s, NMJ is probably not running!" % (host), logger.WARNING)
             return False
-        
+
         # if the device is a remote host then try to parse the mounting URL and save it to the config
         if device.startswith("NETWORK_SHARE/"):
             match = re.search(".*(?=\r\n?%s)" % (re.escape(device[14:])), tnoutput)
 
             if match:
                 mount = match.group().replace("127.0.0.1", host)
-                logger.log(u"Found mounting url on the Popcorn Hour in configuration: %s" % (mount), logger.DEBUG)
+                logger.log(u"NMJ: Found mounting url on the Popcorn Hour in configuration: %s" % (mount), logger.DEBUG)
                 sickbeard.NMJ_MOUNT = mount
             else:
-                logger.log(u"Detected a network share on the Popcorn Hour, but could not get the mounting url", logger.DEBUG)
+                logger.log(u"NMJ: Detected a network share on the Popcorn Hour, but could not get the mounting url", logger.WARNING)
                 return False
 
         return True
-    
-    def notify_snatch(self, ep_name):
-        return False
-        #Not implemented: Start the scanner when snatched does not make any sense
-
-    def notify_download(self, ep_name):
-        if sickbeard.USE_NMJ:
-            self._notifyNMJ()
-
-    def test_notify(self, host, database, mount):
-        return self._sendNMJ(host, database, mount)
 
     def _sendNMJ(self, host, database, mount=None):
         """
         Sends a NMJ update command to the specified machine
-        
+
         host: The hostname/IP to send the request to (no port)
-        database: The database to send the requst to
+        database: The database to send the request to
         mount: The mount URL to use (optional)
-        
+
         Returns: True if the request succeeded, False otherwise
         """
-        
+
         # if a mount URL is provided then attempt to open a handle to that URL
         if mount:
             try:
                 req = urllib2.Request(mount)
-                logger.log(u"Try to mount network drive via url: %s" % (mount), logger.DEBUG)
+                logger.log(u"NMJ: Try to mount network drive via url: %s" % (mount), logger.DEBUG)
                 handle = urllib2.urlopen(req)
             except IOError, e:
-                logger.log(u"Warning: Couldn't contact popcorn hour on host %s: %s" % (host, e))
+                if hasattr(e, 'reason'):
+                    logger.log(u"NMJ: Could not contact Popcorn Hour on host %s: %s" % (host, e.reason), logger.WARNING)
+                elif hasattr(e, 'code'):
+                    logger.log(u"NMJ: Problem with Popcorn Hour on host %s: %s" % (host, e.code), logger.WARNING)
+                return False
+            except Exception, e:
+                logger.log(u"NMJ: Unknown exception: " + ex(e), logger.ERROR)
                 return False
 
         # build up the request URL and parameters
@@ -121,18 +118,25 @@ def _sendNMJ(self, host, database, mount=None):
             "arg0": "scanner_start",
             "arg1": database,
             "arg2": "background",
-            "arg3": ""}
+            "arg3": ""
+        }
         params = urllib.urlencode(params)
         updateUrl = UPDATE_URL % {"host": host, "params": params}
 
         # send the request to the server
         try:
             req = urllib2.Request(updateUrl)
-            logger.log(u"Sending NMJ scan update command via url: %s" % (updateUrl), logger.DEBUG)
+            logger.log(u"NMJ: Sending NMJ scan update command via url: %s" % (updateUrl), logger.DEBUG)
             handle = urllib2.urlopen(req)
             response = handle.read()
         except IOError, e:
-            logger.log(u"Warning: Couldn't contact Popcorn Hour on host %s: %s" % (host, e))
+            if hasattr(e, 'reason'):
+                logger.log(u"NMJ: Could not contact Popcorn Hour on host %s: %s" % (host, e.reason), logger.WARNING)
+            elif hasattr(e, 'code'):
+                logger.log(u"NMJ: Problem with Popcorn Hour on host %s: %s" % (host, e.code), logger.WARNING)
+            return False
+        except Exception, e:
+            logger.log(u"NMJ: Unknown exception: " + ex(e), logger.ERROR)
             return False
 
         # try to parse the resulting XML
@@ -140,28 +144,28 @@ def _sendNMJ(self, host, database, mount=None):
             et = etree.fromstring(response)
             result = et.findtext("returnValue")
         except SyntaxError, e:
-            logger.log(u"Unable to parse XML returned from the Popcorn Hour: %s" % (e), logger.ERROR)
+            logger.log(u"NMJ: Unable to parse XML returned from the Popcorn Hour: %s" % (e), logger.ERROR)
             return False
-        
+
         # if the result was a number then consider that an error
         if int(result) > 0:
-            logger.log(u"Popcorn Hour returned an errorcode: %s" % (result))
+            logger.log(u"NMJ: Popcorn Hour returned an errorcode: %s" % (result), logger.ERROR)
             return False
         else:
-            logger.log(u"NMJ started background scan")
+            logger.log(u"NMJ: Started background scan.", logger.MESSAGE)
             return True
 
     def _notifyNMJ(self, host=None, database=None, mount=None, force=False):
         """
         Sends a NMJ update command based on the SB config settings
-        
+
         host: The host to send the command to (optional, defaults to the host in the config)
         database: The database to use (optional, defaults to the database in the config)
         mount: The mount URL (optional, defaults to the mount URL in the config)
         force: If True then the notification will be sent even if NMJ is disabled in the config
         """
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_NMJ and not force:
-            logger.log("Notification for NMJ scan update not enabled, skipping this notification", logger.DEBUG)
             return False
 
         # fill in omitted parameters
@@ -172,8 +176,25 @@ def _notifyNMJ(self, host=None, database=None, mount=None, force=False):
         if not mount:
             mount = sickbeard.NMJ_MOUNT
 
-        logger.log(u"Sending scan command for NMJ ", logger.DEBUG)
+        logger.log(u"NMJ: Sending scan command.", logger.DEBUG)
 
         return self._sendNMJ(host, database, mount)
 
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        pass
+
+    def notify_download(self, ep_name):
+        pass
+
+    def test_notify(self, host, database, mount):
+        return self._notifyNMJ(host, database, mount, force=True)
+
+    def update_library(self, ep_obj=None):
+        if sickbeard.USE_NMJ:
+            self._notifyNMJ()
+
 notifier = NMJNotifier
diff --git a/sickbeard/notifiers/nmjv2.py b/sickbeard/notifiers/nmjv2.py
index c5f096f54a..1128946837 100644
--- a/sickbeard/notifiers/nmjv2.py
+++ b/sickbeard/notifiers/nmjv2.py
@@ -17,11 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib, urllib2,xml.dom.minidom
+import urllib2
 from xml.dom.minidom import parseString
 import sickbeard
-import telnetlib
-import re
 import time
 
 from sickbeard import logger
@@ -33,140 +31,151 @@
 
 
 class NMJv2Notifier:
-    
-    def notify_snatch(self, ep_name):
-        return False
-        #Not implemented: Start the scanner when snatched does not make any sense
-
-    def notify_download(self, ep_name):
-        self._notifyNMJ()
-
-    def test_notify(self, host):
-        return self._sendNMJ(host)
 
     def notify_settings(self, host, dbloc, instance):
         """
-        Retrieves the NMJv2 database location from Popcorn hour
-        
+        Retrieves the NMJv2 database location from Popcorn Hour
+
         host: The hostname/IP of the Popcorn Hour server
         dbloc: 'local' for PCH internal harddrive. 'network' for PCH network shares
         instance: Allows for selection of different DB in case of multiple databases
-        
+
         Returns: True if the settings were retrieved successfully, False otherwise
         """
         try:
-            url_loc = "http://" + host + ":8008/file_operation?arg0=list_user_storage_file&arg1=&arg2="+instance+"&arg3=20&arg4=true&arg5=true&arg6=true&arg7=all&arg8=name_asc&arg9=false&arg10=false"
+            url_loc = "http://" + host + ":8008/file_operation?arg0=list_user_storage_file&arg1=&arg2=" + instance + "&arg3=20&arg4=true&arg5=true&arg6=true&arg7=all&arg8=name_asc&arg9=false&arg10=false"
             req = urllib2.Request(url_loc)
             handle1 = urllib2.urlopen(req)
             response1 = handle1.read()
+            # TODO: convert to etree?
             xml = parseString(response1)
-            time.sleep (300.0 / 1000.0)
+            time.sleep(0.5)
             for node in xml.getElementsByTagName('path'):
-                xmlTag=node.toxml();
-                xmlData=xmlTag.replace('<path>','').replace('</path>','').replace('[=]','')
-                url_db = "http://" + host + ":8008/metadata_database?arg0=check_database&arg1="+ xmlData
+                xmlTag = node.toxml()
+                xmlData = xmlTag.replace('<path>', '').replace('</path>', '').replace('[=]', '')
+                url_db = "http://" + host + ":8008/metadata_database?arg0=check_database&arg1=" + xmlData
                 reqdb = urllib2.Request(url_db)
                 handledb = urllib2.urlopen(reqdb)
                 responsedb = handledb.read()
                 xmldb = parseString(responsedb)
-                returnvalue=xmldb.getElementsByTagName('returnValue')[0].toxml().replace('<returnValue>','').replace('</returnValue>','')
-                if returnvalue=="0":
-                    DB_path=xmldb.getElementsByTagName('database_path')[0].toxml().replace('<database_path>','').replace('</database_path>','').replace('[=]','')
-                    if dbloc=="local" and DB_path.find("localhost")>-1:
-                        sickbeard.NMJv2_HOST=host
-                        sickbeard.NMJv2_DATABASE=DB_path
+                returnvalue = xmldb.getElementsByTagName('returnValue')[0].toxml().replace('<returnValue>', '').replace('</returnValue>', '')
+                if returnvalue == "0":
+                    DB_path = xmldb.getElementsByTagName('database_path')[0].toxml().replace('<database_path>', '').replace('</database_path>', '').replace('[=]', '')
+                    if dbloc == "local" and DB_path.find("localhost") > -1:
+                        sickbeard.NMJv2_HOST = host
+                        sickbeard.NMJv2_DATABASE = DB_path
                         return True
-                    if dbloc=="network" and DB_path.find("://")>-1:
-                        sickbeard.NMJv2_HOST=host
-                        sickbeard.NMJv2_DATABASE=DB_path
+                    if dbloc == "network" and DB_path.find("://") > -1:
+                        sickbeard.NMJv2_HOST = host
+                        sickbeard.NMJv2_DATABASE = DB_path
                         return True
-                        
         except IOError, e:
-            logger.log(u"Warning: Couldn't contact popcorn hour on host %s: %s" % (host, e))
+            logger.log(u"NMJv2: Could not contact Popcorn Hour on host %s: %s" % (host, e), logger.WARNING)
             return False
+
         return False
 
     def _sendNMJ(self, host):
         """
         Sends a NMJ update command to the specified machine
-        
+
         host: The hostname/IP to send the request to (no port)
-        database: The database to send the requst to
+        database: The database to send the request to
         mount: The mount URL to use (optional)
-        
+
         Returns: True if the request succeeded, False otherwise
         """
-        
+
         #if a host is provided then attempt to open a handle to that URL
         try:
-            url_scandir = "http://" + host + ":8008/metadata_database?arg0=update_scandir&arg1="+ sickbeard.NMJv2_DATABASE +"&arg2=&arg3=update_all"
-            logger.log(u"NMJ scan update command send to host: %s" % (host))
-            url_updatedb = "http://" + host + ":8008/metadata_database?arg0=scanner_start&arg1="+ sickbeard.NMJv2_DATABASE +"&arg2=background&arg3="
-            logger.log(u"Try to mount network drive via url: %s" % (host), logger.DEBUG)
+            url_scandir = "http://" + host + ":8008/metadata_database?arg0=update_scandir&arg1=" + sickbeard.NMJv2_DATABASE + "&arg2=&arg3=update_all"
+            logger.log(u"NMJv2: Scan update command send to host: %s" % (host), logger.DEBUG)
+            url_updatedb = "http://" + host + ":8008/metadata_database?arg0=scanner_start&arg1=" + sickbeard.NMJv2_DATABASE + "&arg2=background&arg3="
+            logger.log(u"NMJv2: Try to mount network drive via url: %s" % (host), logger.DEBUG)
             prereq = urllib2.Request(url_scandir)
             req = urllib2.Request(url_updatedb)
             handle1 = urllib2.urlopen(prereq)
             response1 = handle1.read()
-            time.sleep (300.0 / 1000.0)
+            time.sleep(0.5)
             handle2 = urllib2.urlopen(req)
             response2 = handle2.read()
         except IOError, e:
-            logger.log(u"Warning: Couldn't contact popcorn hour on host %s: %s" % (host, e))
+            logger.log(u"NMJv2: Could not contact Popcorn Hour on host %s: %s" % (host, e), logger.WARNING)
             return False
-        try:            
+
+        try:
             et = etree.fromstring(response1)
             result1 = et.findtext("returnValue")
         except SyntaxError, e:
-             logger.log(u"Unable to parse XML returned from the Popcorn Hour: update_scandir, %s" % (e), logger.ERROR)
-             return False
-        try:            
+            logger.log(u"NMJv2: Unable to parse XML returned from the Popcorn Hour: update_scandir, %s" % (e), logger.ERROR)
+            return False
+
+        try:
             et = etree.fromstring(response2)
             result2 = et.findtext("returnValue")
         except SyntaxError, e:
-            logger.log(u"Unable to parse XML returned from the Popcorn Hour: scanner_start, %s" % (e), logger.ERROR)
+            logger.log(u"NMJv2: Unable to parse XML returned from the Popcorn Hour: scanner_start, %s" % (e), logger.ERROR)
             return False
-                
+
         # if the result was a number then consider that an error
-        error_codes=["8","11","22","49","50","51","60"]
-        error_messages=["Invalid parameter(s)/argument(s)",
+        error_codes = ["8", "11", "22", "49", "50", "51", "60"]
+        error_messages = ["Invalid parameter(s)/argument(s)",
                         "Invalid database path",
                         "Insufficient size",
                         "Database write error",
                         "Database read error",
                         "Open fifo pipe failed",
                         "Read only file system"]
+
         if int(result1) > 0:
-            index=error_codes.index(result1)
-            logger.log(u"Popcorn Hour returned an error: %s" % (error_messages[index]))
+            index = error_codes.index(result1)
+            logger.log(u"NMJv2: Popcorn Hour returned an error: %s" % (error_messages[index]), logger.ERROR)
             return False
         else:
             if int(result2) > 0:
-                index=error_codes.index(result2)
-                logger.log(u"Popcorn Hour returned an error: %s" % (error_messages[index]))
+                index = error_codes.index(result2)
+                logger.log(u"NMJv2: Popcorn Hour returned an error: %s" % (error_messages[index]), logger.ERROR)
                 return False
             else:
-                logger.log(u"NMJv2 started background scan")
+                logger.log(u"NMJv2: Started background scan.", logger.MESSAGE)
                 return True
 
     def _notifyNMJ(self, host=None, force=False):
         """
         Sends a NMJ update command based on the SB config settings
-        
+
         host: The host to send the command to (optional, defaults to the host in the config)
         database: The database to use (optional, defaults to the database in the config)
         mount: The mount URL (optional, defaults to the mount URL in the config)
         force: If True then the notification will be sent even if NMJ is disabled in the config
         """
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_NMJv2 and not force:
-            logger.log("Notification for NMJ scan update not enabled, skipping this notification", logger.DEBUG)
             return False
 
         # fill in omitted parameters
         if not host:
             host = sickbeard.NMJv2_HOST
 
-        logger.log(u"Sending scan command for NMJ ", logger.DEBUG)
+        logger.log(u"NMJv2: Sending scan command.", logger.DEBUG)
 
         return self._sendNMJ(host)
 
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        pass
+
+    def notify_download(self, ep_name):
+        pass
+
+    def test_notify(self, host):
+        return self._notifyNMJ(host, force=True)
+
+    def update_library(self, ep_obj=None):
+        if sickbeard.USE_NMJv2:
+            self._notifyNMJ()
+
 notifier = NMJv2Notifier
diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py
index 4d1b4362ef..18d87aa835 100644
--- a/sickbeard/notifiers/plex.py
+++ b/sickbeard/notifiers/plex.py
@@ -27,8 +27,10 @@
 from sickbeard.exceptions import ex
 from sickbeard.encodingKludge import fixStupidEncodings
 
-# TODO: switch over to using ElementTree
-from xml.dom import minidom
+try:
+    import xml.etree.cElementTree as etree
+except ImportError:
+    import elementtree.ElementTree as etree
 
 
 class PLEXNotifier:
@@ -54,7 +56,7 @@ def _send_to_plex(self, command, host, username=None, password=None):
             password = sickbeard.PLEX_PASSWORD
 
         if not host:
-            logger.log(u"No Plex host specified, check your settings", logger.DEBUG)
+            logger.log(u"PLEX: No host specified, check your settings", logger.ERROR)
             return False
 
         for key in command:
@@ -62,7 +64,7 @@ def _send_to_plex(self, command, host, username=None, password=None):
                 command[key] = command[key].encode('utf-8')
 
         enc_command = urllib.urlencode(command)
-        logger.log(u"Plex encoded API command: " + enc_command, logger.DEBUG)
+        logger.log(u"PLEX: Encoded API command: " + enc_command, logger.DEBUG)
 
         url = 'http://%s/xbmcCmds/xbmcHttp/?%s' % (host, enc_command)
         try:
@@ -72,24 +74,24 @@ def _send_to_plex(self, command, host, username=None, password=None):
                 base64string = base64.encodestring('%s:%s' % (username, password))[:-1]
                 authheader = "Basic %s" % base64string
                 req.add_header("Authorization", authheader)
-                logger.log(u"Contacting Plex (with auth header) via url: " + url, logger.DEBUG)
+                logger.log(u"PLEX: Contacting (with auth header) via url: " + url, logger.DEBUG)
             else:
-                logger.log(u"Contacting Plex via url: " + url, logger.DEBUG)
+                logger.log(u"PLEX: Contacting via url: " + url, logger.DEBUG)
 
             response = urllib2.urlopen(req)
 
             result = response.read().decode(sickbeard.SYS_ENCODING)
             response.close()
 
-            logger.log(u"Plex HTTP response: " + result.replace('\n', ''), logger.DEBUG)
+            logger.log(u"PLEX: HTTP response: " + result.replace('\n', ''), logger.DEBUG)
             # could return result response = re.compile('<html><li>(.+\w)</html>').findall(result)
             return 'OK'
 
         except (urllib2.URLError, IOError), e:
-            logger.log(u"Warning: Couldn't contact Plex at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
+            logger.log(u"PLEX: Warning: Couldn't contact Plex at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
             return False
 
-    def _notify_pmc(self, message, title="Sick Beard", host=None, username=None, password=None, force=False):
+    def _notify(self, message, title="Sick Beard", host=None, username=None, password=None, force=False):
         """Internal wrapper for the notify_snatch and notify_download functions
 
         Args:
@@ -98,7 +100,7 @@ def _notify_pmc(self, message, title="Sick Beard", host=None, username=None, pas
             host: Plex Media Client(s) host:port
             username: Plex username
             password: Plex password
-            force: Used for the Test method to override config saftey checks
+            force: Used for the Test method to override config safety checks
 
         Returns:
             Returns a list results in the format of host:ip:result
@@ -106,6 +108,10 @@ def _notify_pmc(self, message, title="Sick Beard", host=None, username=None, pas
 
         """
 
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_PLEX and not force:
+            return False
+
         # fill in omitted parameters
         if not host:
             host = sickbeard.PLEX_HOST
@@ -114,14 +120,9 @@ def _notify_pmc(self, message, title="Sick Beard", host=None, username=None, pas
         if not password:
             password = sickbeard.PLEX_PASSWORD
 
-        # suppress notifications if the notifier is disabled but the notify options are checked
-        if not sickbeard.USE_PLEX and not force:
-            logger.log("Notification for Plex not enabled, skipping this notification", logger.DEBUG)
-            return False
-
         result = ''
         for curHost in [x.strip() for x in host.split(",")]:
-            logger.log(u"Sending Plex notification to '" + curHost + "' - " + message, logger.MESSAGE)
+            logger.log(u"PLEX: Sending notification to '" + curHost + "' - " + message, logger.MESSAGE)
 
             command = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + title.encode("utf-8") + ',' + message.encode("utf-8") + ')'}
             notifyResult = self._send_to_plex(command, curHost, username, password)
@@ -136,16 +137,16 @@ def _notify_pmc(self, message, title="Sick Beard", host=None, username=None, pas
 
     def notify_snatch(self, ep_name):
         if sickbeard.PLEX_NOTIFY_ONSNATCH:
-            self._notify_pmc(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
+            self._notify(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
 
     def notify_download(self, ep_name):
         if sickbeard.PLEX_NOTIFY_ONDOWNLOAD:
-            self._notify_pmc(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
+            self._notify(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
 
     def test_notify(self, host, username, password):
-        return self._notify_pmc("Testing Plex notifications from Sick Beard", "Test Notification", host, username, password, force=True)
+        return self._notify("Testing Plex notifications from Sick Beard", "Test Notification", host, username, password, force=True)
 
-    def update_library(self):
+    def update_library(self, ep_obj=None):
         """Handles updating the Plex Media Server host via HTTP API
 
         Plex Media Server currently only supports updating the whole video library and not a specific path.
@@ -157,30 +158,31 @@ def update_library(self):
 
         if sickbeard.USE_PLEX and sickbeard.PLEX_UPDATE_LIBRARY:
             if not sickbeard.PLEX_SERVER_HOST:
-                logger.log(u"No Plex Server host specified, check your settings", logger.DEBUG)
+                logger.log(u"PLEX: No Plex Media Server host specified, check your settings", logger.DEBUG)
                 return False
 
-            logger.log(u"Updating library for the Plex Media Server host: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
+            logger.log(u"PLEX: Updating library for the Plex Media Server host: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
 
             url = "http://%s/library/sections" % sickbeard.PLEX_SERVER_HOST
             try:
-                xml_sections = minidom.parse(urllib.urlopen(url))
+                xml_tree = etree.parse(urllib.urlopen(url))
+                media_container = xml_tree.getroot()
             except IOError, e:
-                logger.log(u"Error while trying to contact Plex Media Server: " + ex(e), logger.ERROR)
+                logger.log(u"PLEX: Error while trying to contact Plex Media Server: " + ex(e), logger.ERROR)
                 return False
 
-            sections = xml_sections.getElementsByTagName('Directory')
+            sections = media_container.findall('.//Directory')
             if not sections:
-                logger.log(u"Plex Media Server not running on: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
+                logger.log(u"PLEX: Plex Media Server not running on: " + sickbeard.PLEX_SERVER_HOST, logger.MESSAGE)
                 return False
 
-            for s in sections:
-                if s.getAttribute('type') == "show":
-                    url = "http://%s/library/sections/%s/refresh" % (sickbeard.PLEX_SERVER_HOST, s.getAttribute('key'))
+            for section in sections:
+                if section.attrib['type'] == "show":
+                    url = "http://%s/library/sections/%s/refresh" % (sickbeard.PLEX_SERVER_HOST, section.attrib['key'])
                     try:
                         urllib.urlopen(url)
                     except Exception, e:
-                        logger.log(u"Error updating library section for Plex Media Server: " + ex(e), logger.ERROR)
+                        logger.log(u"PLEX: Error updating library section for Plex Media Server: " + ex(e), logger.ERROR)
                         return False
 
             return True
diff --git a/sickbeard/notifiers/prowl.py b/sickbeard/notifiers/prowl.py
index 709ea95ca5..30d78ade5a 100644
--- a/sickbeard/notifiers/prowl.py
+++ b/sickbeard/notifiers/prowl.py
@@ -16,81 +16,84 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-from httplib import HTTPSConnection, HTTPException
+from httplib import HTTPSConnection
 from urllib import urlencode
 
-try:
-    # this only exists in 2.6
-    from ssl import SSLError
-except ImportError:
-    # make a fake one since I don't know what it is supposed to be in 2.5
-    class SSLError(Exception):
-        pass
-
 import sickbeard
 
-from sickbeard import logger, common
+from sickbeard.exceptions import ex
+from sickbeard import common
+from sickbeard import logger
 
-class ProwlNotifier:
 
-    def test_notify(self, prowl_api, prowl_priority):
-        return self._sendProwl(prowl_api, prowl_priority, event="Test", message="Testing Prowl settings from Sick Beard", force=True)
+class ProwlNotifier:
 
-    def notify_snatch(self, ep_name):
-        if sickbeard.PROWL_NOTIFY_ONSNATCH:
-            self._sendProwl(prowl_api=None, prowl_priority=None, event=common.notifyStrings[common.NOTIFY_SNATCH], message=ep_name)
+    def _notify(self, prowl_api=None, prowl_priority=None, event=None, message=None, force=False):
 
-    def notify_download(self, ep_name):
-        if sickbeard.PROWL_NOTIFY_ONDOWNLOAD:
-            self._sendProwl(prowl_api=None, prowl_priority=None, event=common.notifyStrings[common.NOTIFY_DOWNLOAD], message=ep_name)
-        
-    def _sendProwl(self, prowl_api=None, prowl_priority=None, event=None, message=None, force=False):
-        
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_PROWL and not force:
-                return False
-        
-        if prowl_api == None:
+            return False
+
+        # fill in omitted parameters
+        if not prowl_api:
             prowl_api = sickbeard.PROWL_API
-            
-        if prowl_priority == None:
+        if not prowl_priority:
             prowl_priority = sickbeard.PROWL_PRIORITY
-        
-            
+
         title = "Sick Beard"
-        
-        logger.log(u"Prowl title: " + title, logger.DEBUG)
-        logger.log(u"Prowl event: " + event, logger.DEBUG)
-        logger.log(u"Prowl message: " + message, logger.DEBUG)
-        logger.log(u"Prowl api: " + prowl_api, logger.DEBUG)
-        logger.log(u"Prowl priority: " + prowl_priority, logger.DEBUG)
-        
-        http_handler = HTTPSConnection("api.prowlapp.com")
-                                                
-        data = {'apikey': prowl_api,
-                'application': title,
-                'event': event,
-                'description': message.encode('utf-8'),
-                'priority': prowl_priority }
+
+        logger.log("PROWL: Sending notice with details: event=\"%s\", message=\"%s\", priority=%s, api=%s" % (event, message, prowl_priority, prowl_api), logger.DEBUG)
 
         try:
+
+            http_handler = HTTPSConnection("api.prowlapp.com")
+
+            data = {'apikey': prowl_api,
+                    'application': title,
+                    'event': event,
+                    'description': message.encode('utf-8'),
+                    'priority': prowl_priority
+                    }
+
             http_handler.request("POST",
-                                    "/publicapi/add",
-                                    headers = {'Content-type': "application/x-www-form-urlencoded"},
-                                    body = urlencode(data))
-        except (SSLError, HTTPException):
-            logger.log(u"Prowl notification failed.", logger.ERROR)
+                                 "/publicapi/add",
+                                 headers={'Content-type': "application/x-www-form-urlencoded"},
+                                 body=urlencode(data)
+                                 )
+
+            response = http_handler.getresponse()
+            request_status = response.status
+
+        except Exception, e:
+            logger.log(u"PROWL: Notification failed: " + ex(e), logger.ERROR)
             return False
-        response = http_handler.getresponse()
-        request_status = response.status
 
         if request_status == 200:
-                logger.log(u"Prowl notifications sent.", logger.DEBUG)
-                return True
-        elif request_status == 401: 
-                logger.log(u"Prowl auth failed: %s" % response.reason, logger.ERROR)
-                return False
+            logger.log(u"PROWL: Notifications sent.", logger.MESSAGE)
+            return True
+        elif request_status == 401:
+            logger.log(u"PROWL: Auth failed: %s" % response.reason, logger.ERROR)
+            return False
         else:
-                logger.log(u"Prowl notification failed.", logger.ERROR)
-                return False
-                
+            logger.log(u"PROWL: Notification failed.", logger.ERROR)
+            return False
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.PROWL_NOTIFY_ONSNATCH:
+            self._notify(prowl_api=None, prowl_priority=None, event=common.notifyStrings[common.NOTIFY_SNATCH], message=ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.PROWL_NOTIFY_ONDOWNLOAD:
+            self._notify(prowl_api=None, prowl_priority=None, event=common.notifyStrings[common.NOTIFY_DOWNLOAD], message=ep_name)
+
+    def test_notify(self, prowl_api, prowl_priority):
+        return self._notify(prowl_api, prowl_priority, event="Test", message="Testing Prowl settings from Sick Beard", force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
+
 notifier = ProwlNotifier
diff --git a/sickbeard/notifiers/pushover.py b/sickbeard/notifiers/pushover.py
index 4e6cd5d6ba..7ff796f18b 100644
--- a/sickbeard/notifiers/pushover.py
+++ b/sickbeard/notifiers/pushover.py
@@ -18,7 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-import urllib, urllib2
+import urllib
+import urllib2
 import time
 
 import sickbeard
@@ -30,25 +31,23 @@
 API_URL = "https://api.pushover.net/1/messages.json"
 API_KEY = "OKCXmkvHN1syU2e8xvpefTnyvVWGv5"
 
-class PushoverNotifier:
 
-    def test_notify(self, userKey=None):
-        return self._sendPushover("This is a test notification from SickBeard", 'Test', userKey )
+class PushoverNotifier:
 
-    def _sendPushover(self, msg, title, userKey=None ):
+    def _sendPushover(self, msg, title, userKey=None):
         """
         Sends a pushover notification to the address provided
-        
+
         msg: The message to send (unicode)
         title: The title of the message
         userKey: The pushover user id to send the message to (or to subscribe with)
-        
+
         returns: True if the message succeeded, False otherwise
         """
 
         if not userKey:
             userKey = sickbeard.PUSHOVER_USERKEY
-        
+
         # build up the URL and parameters
         msg = msg.strip()
         curUrl = API_URL
@@ -59,78 +58,84 @@ def _sendPushover(self, msg, title, userKey=None ):
             'user': userKey,
             'message': msg.encode('utf-8'),
             'timestamp': int(time.time())
-			})
-
+            })
 
         # send the request to pushover
         try:
             req = urllib2.Request(curUrl)
             handle = urllib2.urlopen(req, data)
             handle.close()
-            
+
         except urllib2.URLError, e:
             # if we get an error back that doesn't have an error code then who knows what's really happening
             if not hasattr(e, 'code'):
-                logger.log("Pushover notification failed." + ex(e), logger.ERROR)
+                logger.log(u"PUSHOVER: Notification failed." + ex(e), logger.ERROR)
                 return False
             else:
-                logger.log("Pushover notification failed. Error code: " + str(e.code), logger.WARNING)
+                logger.log(u"PUSHOVER: Notification failed. Error code: " + str(e.code), logger.ERROR)
 
             # HTTP status 404 if the provided email address isn't a Pushover user.
             if e.code == 404:
-                logger.log("Username is wrong/not a pushover email. Pushover will send an email to it", logger.WARNING)
+                logger.log(u"PUSHOVER: Username is wrong/not a Pushover email. Pushover will send an email to it", logger.WARNING)
                 return False
-            
+
             # For HTTP status code 401's, it is because you are passing in either an invalid token, or the user has not added your service.
             elif e.code == 401:
-                
+
                 #HTTP status 401 if the user doesn't have the service added
                 subscribeNote = self._sendPushover(msg, title, userKey )
                 if subscribeNote:
-                    logger.log("Subscription send", logger.DEBUG)
+                    logger.log(u"PUSHOVER: Subscription sent", logger.DEBUG)
                     return True
                 else:
-                    logger.log("Subscription could not be send", logger.ERROR)
+                    logger.log(u"PUSHOVER: Subscription could not be sent", logger.ERROR)
                     return False
-            
+
             # If you receive an HTTP status code of 400, it is because you failed to send the proper parameters
             elif e.code == 400:
-                logger.log("Wrong data sent to pushover", logger.ERROR)
+                logger.log(u"PUSHOVER: Wrong data sent to Pushover", logger.ERROR)
                 return False
 
-        logger.log("Pushover notification successful.", logger.DEBUG)
+        logger.log(u"PUSHOVER: Notification successful.", logger.MESSAGE)
         return True
 
-    def notify_snatch(self, ep_name, title=notifyStrings[NOTIFY_SNATCH]):
-        if sickbeard.PUSHOVER_NOTIFY_ONSNATCH:
-            self._notifyPushover(title, ep_name)
-            
-
-    def notify_download(self, ep_name, title=notifyStrings[NOTIFY_DOWNLOAD]):
-        if sickbeard.PUSHOVER_NOTIFY_ONDOWNLOAD:
-            self._notifyPushover(title, ep_name)
-
-    def _notifyPushover(self, title, message, userKey=None ):
+    def _notify(self, title, message, userKey=None, force=False):
         """
         Sends a pushover notification based on the provided info or SB config
 
         title: The title of the notification to send
         message: The message string to send
-        userKey: The userKey to send the notification to 
+        userKey: The userKey to send the notification to
         """
 
-        if not sickbeard.USE_PUSHOVER:
-            logger.log("Notification for Pushover not enabled, skipping this notification", logger.DEBUG)
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_PUSHOVER and not force:
             return False
 
-        # if no userKey was given then use the one from the config
+        # fill in omitted parameters
         if not userKey:
             userKey = sickbeard.PUSHOVER_USERKEY
 
-        logger.log("Sending notification for " + message, logger.DEBUG)
+        logger.log(u"PUSHOVER: Sending notification for " + message, logger.DEBUG)
 
-        # self._sendPushover(message, title, userKey)
-        self._sendPushover(message, title)
-        return True
+        return self._sendPushover(message, title)
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.PUSHOVER_NOTIFY_ONSNATCH:
+            self._notify(notifyStrings[NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.PUSHOVER_NOTIFY_ONDOWNLOAD:
+            self._notify(notifyStrings[NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self, userKey=None):
+        return self._notify("This is a test notification from Sick Beard", "Test", userKey, force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
 
 notifier = PushoverNotifier
diff --git a/sickbeard/notifiers/pytivo.py b/sickbeard/notifiers/pytivo.py
index 3f4aa30b48..5c3446dd4d 100644
--- a/sickbeard/notifiers/pytivo.py
+++ b/sickbeard/notifiers/pytivo.py
@@ -20,80 +20,78 @@
 import sickbeard
 
 from urllib import urlencode
-from urllib2 import Request, urlopen, URLError
+from urllib2 import Request, urlopen
 
 from sickbeard import logger
+from sickbeard.exceptions import ex
 from sickbeard import encodingKludge as ek
 
+
 class pyTivoNotifier:
 
+##############################################################################
+# Public functions
+##############################################################################
+
     def notify_snatch(self, ep_name):
         pass
 
     def notify_download(self, ep_name):
         pass
 
-    def update_library(self, ep_obj):
+    def update_library(self, ep_obj=None):
 
-        # Values from config
-        
         if not sickbeard.USE_PYTIVO:
             return False
-        
+
         host = sickbeard.PYTIVO_HOST
         shareName = sickbeard.PYTIVO_SHARE_NAME
         tsn = sickbeard.PYTIVO_TIVO_NAME
-        
+
         # There are two more values required, the container and file.
-        # 
+        #
         # container: The share name, show name and season
         #
         # file: The file name
-        # 
-        # Some slicing and dicing of variables is required to get at these values.
-        #
-        # There might be better ways to arrive at the values, but this is the best I have been able to 
-        # come up with.
         #
-        
-        
+        # Some slicing and dicing of variables is required to get at these values.
+
         # Calculated values
-        
         showPath = ep_obj.show.location
         showName = ep_obj.show.name
-        rootShowAndSeason = ek.ek(os.path.dirname, ep_obj.location)      
+        rootShowAndSeason = ek.ek(os.path.dirname, ep_obj.location)
         absPath = ep_obj.location
-        
+
         # Some show names have colons in them which are illegal in a path location, so strip them out.
         # (Are there other characters?)
-        showName = showName.replace(":","")
-        
+        showName = showName.replace(":", "")
+
         root = showPath.replace(showName, "")
         showAndSeason = rootShowAndSeason.replace(root, "")
-        
+
         container = shareName + "/" + showAndSeason
-        file = "/" + absPath.replace(root, "")
-        
+        mediaFile = "/" + absPath.replace(root, "")
+
         # Finally create the url and make request
-        requestUrl = "http://" + host + "/TiVoConnect?" + urlencode( {'Command':'Push', 'Container':container, 'File':file, 'tsn':tsn} )
-               
-        logger.log(u"pyTivo notification: Requesting " + requestUrl)
-        
-        request = Request( requestUrl )
+        requestUrl = "http://" + host + "/TiVoConnect?" + urlencode( {'Command': 'Push', 'Container': container, 'File': mediaFile, 'tsn': tsn})
+
+        logger.log(u"PYTIVO: Requesting " + requestUrl, logger.DEBUG)
+
+        request = Request(requestUrl)
 
         try:
-            response = urlopen(request) #@UnusedVariable   
-        except URLError, e:
+            response = urlopen(request)  # @UnusedVariable
+        except IOError, e:
             if hasattr(e, 'reason'):
-                logger.log(u"pyTivo notification: Error, failed to reach a server")
-                logger.log(u"'Error reason: " + e.reason)
-                return False
+                logger.log(u"PYTIVO: Failed to reach server '%s' - %s" % (host, e.reason), logger.WARNING)
             elif hasattr(e, 'code'):
-                logger.log(u"pyTivo notification: Error, the server couldn't fulfill the request")
-                logger.log(u"Error code: " + e.code)
-                return False
+                logger.log(u"PYTIVO: The server could not fulfill the request '%s' - %s" % (host, e.code), logger.WARNING)
+            return False
+        except Exception, e:
+            logger.log(u"PYTIVO: Unknown exception: " + ex(e), logger.ERROR)
+            return False
         else:
-            logger.log(u"pyTivo notification: Successfully requested transfer of file")
+            logger.log(u"PYTIVO: Successfully requested transfer of file", logger.MESSAGE)
             return True
 
 notifier = pyTivoNotifier
diff --git a/sickbeard/notifiers/synoindex.py b/sickbeard/notifiers/synoindex.py
index 2eaeedbfb7..7daaea6769 100755
--- a/sickbeard/notifiers/synoindex.py
+++ b/sickbeard/notifiers/synoindex.py
@@ -16,24 +16,18 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
 import os
 import subprocess
 
 import sickbeard
 
 from sickbeard import logger
+from sickbeard.common import notifyStrings, NOTIFY_SNATCH, NOTIFY_DOWNLOAD
 from sickbeard import encodingKludge as ek
 from sickbeard.exceptions import ex
 
-class synoIndexNotifier:
-
-    def notify_snatch(self, ep_name):
-        pass
 
-    def notify_download(self, ep_name):
-        pass
+class synoIndexNotifier:
 
     def moveFolder(self, old_path, new_path):
         self.moveObject(old_path, new_path)
@@ -44,14 +38,14 @@ def moveFile(self, old_file, new_file):
     def moveObject(self, old_path, new_path):
         if sickbeard.USE_SYNOINDEX:
             synoindex_cmd = ['/usr/syno/bin/synoindex', '-N', ek.ek(os.path.abspath, new_path), ek.ek(os.path.abspath, old_path)]
-            logger.log(u"Executing command "+str(synoindex_cmd))
-            logger.log(u"Absolute path to command: "+ek.ek(os.path.abspath, synoindex_cmd[0]), logger.DEBUG)
+            logger.log(u"SYNOINDEX: Executing command " + str(synoindex_cmd), logger.DEBUG)
+            logger.log(u"SYNOINDEX: Absolute path to command: " + ek.ek(os.path.abspath, synoindex_cmd[0]), logger.DEBUG)
             try:
                 p = subprocess.Popen(synoindex_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=sickbeard.PROG_DIR)
-                out, err = p.communicate() #@UnusedVariable
-                logger.log(u"Script result: "+str(out), logger.DEBUG)
+                out, err = p.communicate()  # @UnusedVariable
+                logger.log(u"SYNOINDEX: Script result: " + str(out), logger.DEBUG)
             except OSError, e:
-                logger.log(u"Unable to run synoindex: "+ex(e))
+                logger.log(u"SYNOINDEX: Unable to run synoindex: " + ex(e), logger.WARNING)
 
     def deleteFolder(self, cur_path):
         self.makeObject('-D', cur_path)
@@ -68,13 +62,58 @@ def addFile(self, cur_file):
     def makeObject(self, cmd_arg, cur_path):
         if sickbeard.USE_SYNOINDEX:
             synoindex_cmd = ['/usr/syno/bin/synoindex', cmd_arg, ek.ek(os.path.abspath, cur_path)]
-            logger.log(u"Executing command "+str(synoindex_cmd))
-            logger.log(u"Absolute path to command: "+ek.ek(os.path.abspath, synoindex_cmd[0]), logger.DEBUG)
+            logger.log(u"SYNOINDEX: Executing command " + str(synoindex_cmd), logger.DEBUG)
+            logger.log(u"SYNOINDEX: Absolute path to command: " + ek.ek(os.path.abspath, synoindex_cmd[0]), logger.DEBUG)
             try:
                 p = subprocess.Popen(synoindex_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=sickbeard.PROG_DIR)
-                out, err = p.communicate() #@UnusedVariable
-                logger.log(u"Script result: "+str(out), logger.DEBUG)
+                out, err = p.communicate()  # @UnusedVariable
+                logger.log(u"SYNOINDEX: Script result: " + str(out), logger.DEBUG)
             except OSError, e:
-                logger.log(u"Unable to run synoindex: "+ex(e))
+                logger.log(u"SYNOINDEX: Unable to run synoindex: " + ex(e), logger.WARNING)
+
+    def _notify(self, message, title, force=False):
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_SYNOINDEX and not force:
+            return False
+
+        synodsmnotify_cmd = ['/usr/syno/bin/synodsmnotify', '@administrators', title, message]
+        logger.log(u"SYNOINDEX: Executing command " + str(synodsmnotify_cmd), logger.DEBUG)
+
+        try:
+            p = subprocess.Popen(synodsmnotify_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                                 cwd=sickbeard.PROG_DIR)
+
+            output, err = p.communicate()  # @UnusedVariable
+            exit_status = p.returncode
+
+            logger.log(u"SYNOINDEX: Script result: " + str(output), logger.DEBUG)
+
+            if exit_status == 0:
+                return True
+            else:
+                return False
+
+        except OSError, e:
+            logger.log(u"SYNOINDEX: Unable to run synodsmnotify: " + ex(e), logger.WARNING)
+            return False
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.SYNOINDEX_NOTIFY_ONSNATCH:
+            self._notify(notifyStrings[NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.SYNOINDEX_NOTIFY_ONDOWNLOAD:
+            self._notify(notifyStrings[NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self):
+        return self._notify("This is a test notification from Sick Beard", "Test", force=True)
+
+    def update_library(self, ep_obj=None):
+        if sickbeard.USE_SYNOINDEX:
+            self.addFile(ep_obj.location)
 
 notifier = synoIndexNotifier
diff --git a/sickbeard/notifiers/trakt.py b/sickbeard/notifiers/trakt.py
index d5bcb65150..1d51366d17 100644
--- a/sickbeard/notifiers/trakt.py
+++ b/sickbeard/notifiers/trakt.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
-
 import urllib2
 
 from hashlib import sha1
@@ -30,126 +29,118 @@
 
 from sickbeard import logger
 
-class TraktNotifier:
-    """
-    A "notifier" for trakt.tv which keeps track of what has and hasn't been added to your library.
-    """
-
-    def notify_snatch(self, ep_name):
-        pass
-
-    def notify_download(self, ep_name):
-        pass
-
-    def update_library(self, ep_obj):
-        """
-        Sends a request to trakt indicating that the given episode is part of our library.
-        
-        ep_obj: The TVEpisode object to add to trakt
-        """
-        
-        if sickbeard.USE_TRAKT:
-            method = "show/episode/library/"
-            method += "%API%"
-            
-            # URL parameters
-            data = {
-                'tvdb_id': ep_obj.show.tvdbid,
-                'title': ep_obj.show.name,
-                'year': ep_obj.show.startyear,
-                'episodes': [ {
-                    'season': ep_obj.season,
-                    'episode': ep_obj.episode
-                    } ]
-                }
-            
-            if data is not None:
-                self._notifyTrakt(method, None, None, None, data)
-
-    def test_notify(self, api, username, password):
-        """
-        Sends a test notification to trakt with the given authentication info and returns a boolean
-        representing success.
-        
-        api: The api string to use
-        username: The username to use
-        password: The password to use
-        
-        Returns: True if the request succeeded, False otherwise
-        """
-        
-        method = "account/test/"
-        method += "%API%"
-        return self._notifyTrakt(method, api, username, password, {})
-
-    def _username(self):
-        return sickbeard.TRAKT_USERNAME
-
-    def _password(self):
-        return sickbeard.TRAKT_PASSWORD
 
-    def _api(self):
-        return sickbeard.TRAKT_API
-
-    def _use_me(self):
-        return sickbeard.USE_TRAKT
+class TraktNotifier:
 
-    def _notifyTrakt(self, method, api, username, password, data = {}):
+    def _notifyTrakt(self, method, api, username, password, data={}, force=False):
         """
         A generic method for communicating with trakt. Uses the method and data provided along
         with the auth info to send the command.
-        
+
         method: The URL to use at trakt, relative, no leading slash.
         api: The API string to provide to trakt
         username: The username to use when logging in
         password: The unencrypted password to use when logging in
-        
+
         Returns: A boolean representing success
         """
-        logger.log("trakt_notifier: Call method " + method, logger.DEBUG)
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_TRAKT and not force:
+            return False
+
+        logger.log(u"TRAKT: Calling method " + method, logger.DEBUG)
 
         # if the API isn't given then use the config API
         if not api:
-            api = self._api()
+            api = sickbeard.TRAKT_API
 
         # if the username isn't given then use the config username
         if not username:
-            username = self._username()
-        
+            username = sickbeard.TRAKT_USERNAME
+
         # if the password isn't given then use the config password
         if not password:
-            password = self._password()
+            password = sickbeard.TRAKT_PASSWORD
         password = sha1(password).hexdigest()
 
-        # replace the API string with what we found
-        method = method.replace("%API%", api)
+        # append apikey to method
+        method += api
 
         data["username"] = username
         data["password"] = password
 
         # take the URL params and make a json object out of them
-        encoded_data = json.dumps(data);
+        encoded_data = json.dumps(data)
 
         # request the URL from trakt and parse the result as json
         try:
-            logger.log("trakt_notifier: Calling method http://api.trakt.tv/" + method + ", with data" + encoded_data, logger.DEBUG)
+            logger.log(u"TRAKT: Calling method http://api.trakt.tv/" + method + ", with data" + encoded_data, logger.DEBUG)
             stream = urllib2.urlopen("http://api.trakt.tv/" + method, encoded_data)
             resp = stream.read()
 
             resp = json.loads(resp)
-            
+
             if ("error" in resp):
                 raise Exception(resp["error"])
 
         except (IOError):
-            logger.log("trakt_notifier: Failed calling method", logger.ERROR)
+            logger.log(u"TRAKT: Failed calling method", logger.ERROR)
             return False
 
         if (resp["status"] == "success"):
-            logger.log("trakt_notifier: Succeeded calling method. Result: " + resp["message"], logger.DEBUG)
+            logger.log(u"TRAKT: Succeeded calling method. Result: " + resp["message"], logger.MESSAGE)
             return True
 
-        logger.log("trakt_notifier: Failed calling method", logger.ERROR)
+        logger.log(u"TRAKT: Failed calling method", logger.ERROR)
         return False
 
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        pass
+
+    def notify_download(self, ep_name):
+        pass
+
+    def test_notify(self, api, username, password):
+        """
+        Sends a test notification to trakt with the given authentication info and returns a boolean
+        representing success.
+
+        api: The api string to use
+        username: The username to use
+        password: The password to use
+
+        Returns: True if the request succeeded, False otherwise
+        """
+
+        method = "account/test/"
+        return self._notifyTrakt(method, api, username, password, {}, force=True)
+
+    def update_library(self, ep_obj=None):
+        """
+        Sends a request to trakt indicating that the given episode is part of our library.
+
+        ep_obj: The TVEpisode object to add to trakt
+        """
+
+        if sickbeard.USE_TRAKT:
+            method = "show/episode/library/"
+
+            # URL parameters
+            data = {
+                    'tvdb_id': ep_obj.show.tvdbid,
+                    'title': ep_obj.show.name,
+                    'year': ep_obj.show.startyear,
+                    'episodes': [ {
+                                   'season': ep_obj.season,
+                                   'episode': ep_obj.episode
+                                   } ]
+                    }
+
+            if data is not None:
+                self._notifyTrakt(method, None, None, None, data)
+
 notifier = TraktNotifier
diff --git a/sickbeard/notifiers/tweet.py b/sickbeard/notifiers/tweet.py
index c56288038b..b243c09a62 100644
--- a/sickbeard/notifiers/tweet.py
+++ b/sickbeard/notifiers/tweet.py
@@ -23,114 +23,120 @@
 
 # parse_qsl moved to urlparse module in v2.6
 try:
-    from urlparse import parse_qsl #@UnusedImport
+    from urlparse import parse_qsl  # @UnusedImport
 except:
-    from cgi import parse_qsl #@Reimport
+    from cgi import parse_qsl  # @Reimport
 
 import lib.oauth2 as oauth
 import lib.pythontwitter as twitter
 
+
 class TwitterNotifier:
 
     consumer_key = "vHHtcB6WzpWDG6KYlBMr8g"
     consumer_secret = "zMqq5CB3f8cWKiRO2KzWPTlBanYmV0VYxSXZ0Pxds0E"
-    
-    REQUEST_TOKEN_URL = 'https://api.twitter.com/oauth/request_token'
-    ACCESS_TOKEN_URL  = 'https://api.twitter.com/oauth/access_token'
-    AUTHORIZATION_URL = 'https://api.twitter.com/oauth/authorize'
-    SIGNIN_URL        = 'https://api.twitter.com/oauth/authenticate'
-    
-    def notify_snatch(self, ep_name):
-        if sickbeard.TWITTER_NOTIFY_ONSNATCH:
-            self._notifyTwitter(common.notifyStrings[common.NOTIFY_SNATCH]+': '+ep_name)
-
-    def notify_download(self, ep_name):
-        if sickbeard.TWITTER_NOTIFY_ONDOWNLOAD:
-            self._notifyTwitter(common.notifyStrings[common.NOTIFY_DOWNLOAD]+': '+ep_name)
 
-    def test_notify(self):
-        return self._notifyTwitter("This is a test notification from Sick Beard", force=True)
+    REQUEST_TOKEN_URL = "https://api.twitter.com/oauth/request_token"
+    ACCESS_TOKEN_URL = "https://api.twitter.com/oauth/access_token"
+    AUTHORIZATION_URL = "https://api.twitter.com/oauth/authorize"
+    SIGNIN_URL = "https://api.twitter.com/oauth/authenticate"
 
     def _get_authorization(self):
-    
-        signature_method_hmac_sha1 = oauth.SignatureMethod_HMAC_SHA1() #@UnusedVariable
-        oauth_consumer             = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret)
-        oauth_client               = oauth.Client(oauth_consumer)
-    
-        logger.log('Requesting temp token from Twitter')
-    
+
+        signature_method_hmac_sha1 = oauth.SignatureMethod_HMAC_SHA1()  # @UnusedVariable
+        oauth_consumer = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret)
+        oauth_client = oauth.Client(oauth_consumer)
+
+        logger.log(u'TWITTER: Requesting temp token from Twitter', logger.DEBUG)
+
         resp, content = oauth_client.request(self.REQUEST_TOKEN_URL, 'GET')
-    
+
         if resp['status'] != '200':
-            logger.log('Invalid respond from Twitter requesting temp token: %s' % resp['status'])
+            logger.log(u"TWITTER: Invalid respond from Twitter requesting temp token: %s" % resp['status'], logger.ERROR)
         else:
             request_token = dict(parse_qsl(content))
-    
+
             sickbeard.TWITTER_USERNAME = request_token['oauth_token']
             sickbeard.TWITTER_PASSWORD = request_token['oauth_token_secret']
-    
-            return self.AUTHORIZATION_URL+"?oauth_token="+ request_token['oauth_token']
-    
+
+            return self.AUTHORIZATION_URL + "?oauth_token=" + request_token['oauth_token']
+
     def _get_credentials(self, key):
         request_token = {}
-    
+
         request_token['oauth_token'] = sickbeard.TWITTER_USERNAME
         request_token['oauth_token_secret'] = sickbeard.TWITTER_PASSWORD
         request_token['oauth_callback_confirmed'] = 'true'
-    
+
         token = oauth.Token(request_token['oauth_token'], request_token['oauth_token_secret'])
         token.set_verifier(key)
-    
-        logger.log('Generating and signing request for an access token using key '+key)
-    
-        signature_method_hmac_sha1 = oauth.SignatureMethod_HMAC_SHA1() #@UnusedVariable
-        oauth_consumer             = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret)
-        logger.log('oauth_consumer: '+str(oauth_consumer))
-        oauth_client  = oauth.Client(oauth_consumer, token)
-        logger.log('oauth_client: '+str(oauth_client))
+
+        logger.log(u"TWITTER: Generating and signing request for an access token using key " + key, logger.DEBUG)
+
+        signature_method_hmac_sha1 = oauth.SignatureMethod_HMAC_SHA1()  # @UnusedVariable
+        oauth_consumer = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret)
+        logger.log(u"TWITTER: oauth_consumer: " + str(oauth_consumer), logger.DEBUG)
+        oauth_client = oauth.Client(oauth_consumer, token)
+        logger.log(u"TWITTER: oauth_client: " + str(oauth_client), logger.DEBUG)
         resp, content = oauth_client.request(self.ACCESS_TOKEN_URL, method='POST', body='oauth_verifier=%s' % key)
-        logger.log('resp, content: '+str(resp)+','+str(content))
-    
-        access_token  = dict(parse_qsl(content))
-        logger.log('access_token: '+str(access_token))
-    
-        logger.log('resp[status] = '+str(resp['status']))
+        logger.log(u"TWITTER: resp, content: " + str(resp) + "," + str(content), logger.DEBUG)
+
+        access_token = dict(parse_qsl(content))
+        logger.log(u"TWITTER: access_token: " + str(access_token), logger.DEBUG)
+
+        logger.log(u"TWITTER: resp[status] = " + str(resp['status']), logger.DEBUG)
         if resp['status'] != '200':
-            logger.log('The request for a token with did not succeed: '+str(resp['status']), logger.ERROR)
+            logger.log(u"TWITTER: The request for a token with did not succeed: " + str(resp['status']), logger.ERROR)
             return False
         else:
-            logger.log('Your Twitter Access Token key: %s' % access_token['oauth_token'])
-            logger.log('Access Token secret: %s' % access_token['oauth_token_secret'])
+            logger.log(u"TWITTER: Your Twitter Access Token key: %s" % access_token['oauth_token'], logger.DEBUG)
+            logger.log(u"TWITTER: Access Token secret: %s" % access_token['oauth_token_secret'], logger.DEBUG)
             sickbeard.TWITTER_USERNAME = access_token['oauth_token']
             sickbeard.TWITTER_PASSWORD = access_token['oauth_token_secret']
             return True
-    
-    
+
     def _send_tweet(self, message=None):
-    
-        username=self.consumer_key
-        password=self.consumer_secret
-        access_token_key=sickbeard.TWITTER_USERNAME
-        access_token_secret=sickbeard.TWITTER_PASSWORD
-    
-        logger.log(u"Sending tweet: "+message)
-    
+
+        username = self.consumer_key
+        password = self.consumer_secret
+        access_token_key = sickbeard.TWITTER_USERNAME
+        access_token_secret = sickbeard.TWITTER_PASSWORD
+
+        logger.log(u"TWITTER: Sending tweet: " + message, logger.DEBUG)
+
         api = twitter.Api(username, password, access_token_key, access_token_secret)
-    
+
         try:
             api.PostUpdate(message)
         except Exception, e:
-            logger.log(u"Error Sending Tweet: "+ex(e), logger.ERROR)
+            logger.log(u"TWITTER: Error Sending Tweet: " + ex(e), logger.ERROR)
             return False
-    
+
         return True
-    
-    def _notifyTwitter(self, message='', force=False):
-        prefix = sickbeard.TWITTER_PREFIX
-    
+
+    def _notify(self, message='', force=False):
+        # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_TWITTER and not force:
             return False
-    
-        return self._send_tweet(prefix+": "+message)
 
-notifier = TwitterNotifier
\ No newline at end of file
+        return self._send_tweet(sickbeard.TWITTER_PREFIX + ": " + message)
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.TWITTER_NOTIFY_ONSNATCH:
+            self._notify(common.notifyStrings[common.NOTIFY_SNATCH] + ': ' + ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.TWITTER_NOTIFY_ONDOWNLOAD:
+            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD] + ': ' + ep_name)
+
+    def test_notify(self):
+        return self._notify("This is a test notification from Sick Beard", force=True)
+
+    def update_library(self, ep_obj):
+        pass
+
+notifier = TwitterNotifier
diff --git a/sickbeard/notifiers/xbmc.py b/sickbeard/notifiers/xbmc.py
index 5366f0b848..21c713803a 100644
--- a/sickbeard/notifiers/xbmc.py
+++ b/sickbeard/notifiers/xbmc.py
@@ -42,7 +42,7 @@
 
 class XBMCNotifier:
 
-    sb_logo_url = 'http://www.sickbeard.com/xbmc-notify.png'
+    sb_logo_url = "http://www.sickbeard.com/notify.png"
 
     def _get_xbmc_version(self, host, username, password):
         """Returns XBMC JSON-RPC API version (odd # = dev, even # = stable)
@@ -67,11 +67,11 @@ def _get_xbmc_version(self, host, username, password):
                  3  | (pre Eden)
                  4  | v11 (Eden)
                  5  | (pre Frodo)
-                 6  | v12 (Frodo)
+                 6  | v12 (Frodo) / v13 (Gotham)
 
         """
 
-        # since we need to maintain python 2.5 compatability we can not pass a timeout delay to urllib2 directly (python 2.6+)
+        # since we need to maintain python 2.5 compatibility we can not pass a timeout delay to urllib2 directly (python 2.6+)
         # override socket timeout to reduce delay for this call alone
         socket.setdefaulttimeout(10)
 
@@ -93,7 +93,7 @@ def _get_xbmc_version(self, host, username, password):
             else:
                 return False
 
-    def _notify_xbmc(self, message, title="Sick Beard", host=None, username=None, password=None, force=False):
+    def _notify(self, message, title="Sick Beard", host=None, username=None, password=None, force=False):
         """Internal wrapper for the notify_snatch and notify_download functions
 
         Detects JSON-RPC version then branches the logic for either the JSON-RPC or legacy HTTP API methods.
@@ -104,7 +104,7 @@ def _notify_xbmc(self, message, title="Sick Beard", host=None, username=None, pa
             host: XBMC webserver host:port
             username: XBMC webserver username
             password: XBMC webserver password
-            force: Used for the Test method to override config saftey checks
+            force: Used for the Test method to override config safety checks
 
         Returns:
             Returns a list results in the format of host:ip:result
@@ -112,6 +112,10 @@ def _notify_xbmc(self, message, title="Sick Beard", host=None, username=None, pa
 
         """
 
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_XBMC and not force:
+            return False
+
         # fill in omitted parameters
         if not host:
             host = sickbeard.XBMC_HOST
@@ -120,31 +124,27 @@ def _notify_xbmc(self, message, title="Sick Beard", host=None, username=None, pa
         if not password:
             password = sickbeard.XBMC_PASSWORD
 
-        # suppress notifications if the notifier is disabled but the notify options are checked
-        if not sickbeard.USE_XBMC and not force:
-            logger.log("Notification for XBMC not enabled, skipping this notification", logger.DEBUG)
-            return False
-
         result = ''
         for curHost in [x.strip() for x in host.split(",")]:
-            logger.log(u"Sending XBMC notification to '" + curHost + "' - " + message, logger.MESSAGE)
+            logger.log(u"XBMC: Sending XBMC notification to '" + curHost + "' - " + message, logger.MESSAGE)
 
             xbmcapi = self._get_xbmc_version(curHost, username, password)
             if xbmcapi:
                 if (xbmcapi <= 4):
-                    logger.log(u"Detected XBMC version <= 11, using XBMC HTTP API", logger.DEBUG)
+                    logger.log(u"XBMC: Detected XBMC version <= 11, using XBMC HTTP API", logger.DEBUG)
                     command = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + title.encode("utf-8") + ',' + message.encode("utf-8") + ')'}
                     notifyResult = self._send_to_xbmc(command, curHost, username, password)
                     if notifyResult:
                         result += curHost + ':' + str(notifyResult)
                 else:
-                    logger.log(u"Detected XBMC version >= 12, using XBMC JSON API", logger.DEBUG)
+                    logger.log(u"XBMC: Detected XBMC version >= 12, using XBMC JSON API", logger.DEBUG)
                     command = '{"jsonrpc":"2.0","method":"GUI.ShowNotification","params":{"title":"%s","message":"%s", "image": "%s"},"id":1}' % (title.encode("utf-8"), message.encode("utf-8"), self.sb_logo_url)
                     notifyResult = self._send_to_xbmc_json(command, curHost, username, password)
                     if notifyResult:
                         result += curHost + ':' + notifyResult["result"].decode(sickbeard.SYS_ENCODING)
             else:
-                logger.log(u"Failed to detect XBMC version for '" + curHost + "', check configuration and try again.", logger.ERROR)
+                if sickbeard.XBMC_ALWAYS_ON or force:
+                    logger.log(u"XBMC: Failed to detect XBMC version for '" + curHost + "', check configuration and try again.", logger.ERROR)
                 result += curHost + ':False'
 
         return result
@@ -174,7 +174,7 @@ def _send_to_xbmc(self, command, host=None, username=None, password=None):
             password = sickbeard.XBMC_PASSWORD
 
         if not host:
-            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            logger.log(u"XBMC: No host specified, check your settings", logger.DEBUG)
             return False
 
         for key in command:
@@ -182,7 +182,7 @@ def _send_to_xbmc(self, command, host=None, username=None, password=None):
                 command[key] = command[key].encode('utf-8')
 
         enc_command = urllib.urlencode(command)
-        logger.log(u"XBMC encoded API command: " + enc_command, logger.DEBUG)
+        logger.log(u"XBMC: Encoded API command: " + enc_command, logger.DEBUG)
 
         url = 'http://%s/xbmcCmds/xbmcHttp/?%s' % (host, enc_command)
         try:
@@ -192,19 +192,16 @@ def _send_to_xbmc(self, command, host=None, username=None, password=None):
                 base64string = base64.encodestring('%s:%s' % (username, password))[:-1]
                 authheader = "Basic %s" % base64string
                 req.add_header("Authorization", authheader)
-                logger.log(u"Contacting XBMC (with auth header) via url: " + fixStupidEncodings(url), logger.DEBUG)
-            else:
-                logger.log(u"Contacting XBMC via url: " + fixStupidEncodings(url), logger.DEBUG)
 
             response = urllib2.urlopen(req)
             result = response.read().decode(sickbeard.SYS_ENCODING)
             response.close()
 
-            logger.log(u"XBMC HTTP response: " + result.replace('\n', ''), logger.DEBUG)
+            logger.log(u"XBMC: HTTP response: " + result.replace('\n', ''), logger.DEBUG)
             return result
 
         except (urllib2.URLError, IOError), e:
-            logger.log(u"Warning: Couldn't contact XBMC HTTP at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
+            logger.log(u"XBMC: Could not contact XBMC HTTP at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
             return False
 
     def _update_library(self, host=None, showName=None):
@@ -223,14 +220,12 @@ def _update_library(self, host=None, showName=None):
         """
 
         if not host:
-            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            logger.log(u"XBMC: No host specified, check your settings", logger.DEBUG)
             return False
 
-        logger.log(u"Updating XBMC library via HTTP method for host: " + host, logger.DEBUG)
-
         # if we're doing per-show
         if showName:
-            logger.log(u"Updating library in XBMC via HTTP method for show " + showName, logger.DEBUG)
+            logger.log(u"XBMC: Updating library via HTTP method for show " + showName, logger.MESSAGE)
 
             pathSql = 'select path.strPath from path, tvshow, tvshowlinkpath where ' \
                 'tvshow.c00 = "%s" and tvshowlinkpath.idShow = tvshow.idShow ' \
@@ -252,42 +247,42 @@ def _update_library(self, host=None, showName=None):
             request = self._send_to_xbmc(resetCommand, host)
 
             if not sqlXML:
-                logger.log(u"Invalid response for " + showName + " on " + host, logger.DEBUG)
+                logger.log(u"XBMC: Invalid response for " + showName + " on " + host, logger.DEBUG)
                 return False
 
             encSqlXML = urllib.quote(sqlXML, ':\\/<>')
             try:
                 et = etree.fromstring(encSqlXML)
             except SyntaxError, e:
-                logger.log(u"Unable to parse XML returned from XBMC: " + ex(e), logger.ERROR)
+                logger.log(u"XBMC: Unable to parse XML returned from XBMC: " + ex(e), logger.ERROR)
                 return False
 
             paths = et.findall('.//field')
 
             if not paths:
-                logger.log(u"No valid paths found for " + showName + " on " + host, logger.DEBUG)
+                logger.log(u"XBMC: No valid paths found for " + showName + " on " + host, logger.DEBUG)
                 return False
 
             for path in paths:
                 # we do not need it double-encoded, gawd this is dumb
                 unEncPath = urllib.unquote(path.text).decode(sickbeard.SYS_ENCODING)
-                logger.log(u"XBMC Updating " + showName + " on " + host + " at " + unEncPath, logger.DEBUG)
+                logger.log(u"XBMC: Updating " + showName + " on " + host + " at " + unEncPath, logger.MESSAGE)
                 updateCommand = {'command': 'ExecBuiltIn', 'parameter': 'XBMC.updatelibrary(video, %s)' % (unEncPath)}
                 request = self._send_to_xbmc(updateCommand, host)
                 if not request:
-                    logger.log(u"Update of show directory failed on " + showName + " on " + host + " at " + unEncPath, logger.ERROR)
+                    logger.log(u"XBMC: Update of show directory failed on " + showName + " on " + host + " at " + unEncPath, logger.WARNING)
                     return False
                 # sleep for a few seconds just to be sure xbmc has a chance to finish each directory
                 if len(paths) > 1:
                     time.sleep(5)
         # do a full update if requested
         else:
-            logger.log(u"Doing Full Library XBMC update on host: " + host, logger.DEBUG)
+            logger.log(u"XBMC: Doing Full Library update via HTTP method for host: " + host, logger.MESSAGE)
             updateCommand = {'command': 'ExecBuiltIn', 'parameter': 'XBMC.updatelibrary(video)'}
             request = self._send_to_xbmc(updateCommand, host)
 
             if not request:
-                logger.log(u"XBMC Full Library update failed on: " + host, logger.ERROR)
+                logger.log(u"XBMC: Full Library update failed on: " + host, logger.ERROR)
                 return False
 
         return True
@@ -317,11 +312,11 @@ def _send_to_xbmc_json(self, command, host=None, username=None, password=None):
             password = sickbeard.XBMC_PASSWORD
 
         if not host:
-            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            logger.log(u"XBMC: No host specified, check your settings", logger.DEBUG)
             return False
 
         command = command.encode('utf-8')
-        logger.log(u"XBMC JSON command: " + command, logger.DEBUG)
+        logger.log(u"XBMC: JSON command: " + command, logger.DEBUG)
 
         url = 'http://%s/jsonrpc' % (host)
         try:
@@ -332,28 +327,25 @@ def _send_to_xbmc_json(self, command, host=None, username=None, password=None):
                 base64string = base64.encodestring('%s:%s' % (username, password))[:-1]
                 authheader = "Basic %s" % base64string
                 req.add_header("Authorization", authheader)
-                logger.log(u"Contacting XBMC (with auth header) via url: " + fixStupidEncodings(url), logger.DEBUG)
-            else:
-                logger.log(u"Contacting XBMC via url: " + fixStupidEncodings(url), logger.DEBUG)
 
             try:
                 response = urllib2.urlopen(req)
             except urllib2.URLError, e:
-                logger.log(u"Error while trying to retrieve XBMC API version for " + host + ": " + ex(e), logger.WARNING)
+                logger.log(u"XBMC: Error while trying to retrieve XBMC API version for " + host + ": " + ex(e), logger.WARNING)
                 return False
 
             # parse the json result
             try:
                 result = json.load(response)
                 response.close()
-                logger.log(u"XBMC JSON response: " + str(result), logger.DEBUG)
-                return result # need to return response for parsing
+                logger.log(u"XBMC: JSON response: " + str(result), logger.DEBUG)
+                return result  # need to return response for parsing
             except ValueError, e:
-                logger.log(u"Unable to decode JSON: " + response, logger.WARNING)
+                logger.log(u"XBMC: Unable to decode JSON: " + response, logger.WARNING)
                 return False
 
         except IOError, e:
-            logger.log(u"Warning: Couldn't contact XBMC JSON API at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
+            logger.log(u"XBMC: Could not contact XBMC JSON API at " + fixStupidEncodings(url) + " " + ex(e), logger.WARNING)
             return False
 
     def _update_library_json(self, host=None, showName=None):
@@ -372,15 +364,13 @@ def _update_library_json(self, host=None, showName=None):
         """
 
         if not host:
-            logger.log(u'No XBMC host passed, aborting update', logger.DEBUG)
+            logger.log(u"XBMC: No host specified, check your settings", logger.DEBUG)
             return False
 
-        logger.log(u"Updating XBMC library via JSON method for host: " + host, logger.MESSAGE)
-
         # if we're doing per-show
         if showName:
             tvshowid = -1
-            logger.log(u"Updating library in XBMC via JSON method for show " + showName, logger.DEBUG)
+            logger.log(u"XBMC: Updating library via JSON method for show " + showName, logger.MESSAGE)
 
             # get tvshowid by showName
             showsCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.GetTVShows","id":1}'
@@ -389,20 +379,20 @@ def _update_library_json(self, host=None, showName=None):
             if showsResponse and "result" in showsResponse and "tvshows" in showsResponse["result"]:
                 shows = showsResponse["result"]["tvshows"]
             else:
-                logger.log(u'No tvshows in XBMC TV show list', logger.DEBUG)
+                logger.log(u"XBMC: No tvshows in XBMC TV show list", logger.DEBUG)
                 return False
 
             for show in shows:
                 if (show["label"] == showName):
                     tvshowid = show["tvshowid"]
-                    break # exit out of loop otherwise the label and showname will not match up
+                    break  # exit out of loop otherwise the label and showname will not match up
 
             # this can be big, so free some memory
             del shows
 
             # we didn't find the show (exact match), thus revert to just doing a full update if enabled
             if (tvshowid == -1):
-                logger.log(u'Exact show name not matched in XBMC TV show list', logger.DEBUG)
+                logger.log(u"XBMC: Exact show name not matched in XBMC TV show list", logger.DEBUG)
                 return False
 
             # lookup tv-show path
@@ -410,33 +400,33 @@ def _update_library_json(self, host=None, showName=None):
             pathResponse = self._send_to_xbmc_json(pathCommand, host)
 
             path = pathResponse["result"]["tvshowdetails"]["file"]
-            logger.log(u"Received Show: " + show["label"] + " with ID: " + str(tvshowid) + " Path: " + path, logger.DEBUG)
+            logger.log(u"XBMC: Received Show: " + show["label"] + " with ID: " + str(tvshowid) + " Path: " + path, logger.DEBUG)
 
             if (len(path) < 1):
-                logger.log(u"No valid path found for " + showName + " with ID: " + str(tvshowid) + " on " + host, logger.WARNING)
+                logger.log(u"XBMC: No valid path found for " + showName + " with ID: " + str(tvshowid) + " on " + host, logger.WARNING)
                 return False
 
-            logger.log(u"XBMC Updating " + showName + " on " + host + " at " + path, logger.DEBUG)
+            logger.log(u"XBMC: Updating " + showName + " on " + host + " at " + path, logger.MESSAGE)
             updateCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.Scan","params":{"directory":%s},"id":1}' % (json.dumps(path))
             request = self._send_to_xbmc_json(updateCommand, host)
             if not request:
-                logger.log(u"Update of show directory failed on " + showName + " on " + host + " at " + path, logger.ERROR)
+                logger.log(u"XBMC: Update of show directory failed on " + showName + " on " + host + " at " + path, logger.WARNING)
                 return False
 
             # catch if there was an error in the returned request
             for r in request:
                 if 'error' in r:
-                    logger.log(u"Error while attempting to update show directory for " + showName + " on " + host + " at " + path, logger.ERROR)
+                    logger.log(u"XBMC: Error while attempting to update show directory for " + showName + " on " + host + " at " + path, logger.ERROR)
                     return False
 
         # do a full update if requested
         else:
-            logger.log(u"Doing Full Library XBMC update on host: " + host, logger.MESSAGE)
+            logger.log(u"XBMC: Doing Full Library update via JSON method for host: " + host, logger.MESSAGE)
             updateCommand = '{"jsonrpc":"2.0","method":"VideoLibrary.Scan","id":1}'
             request = self._send_to_xbmc_json(updateCommand, host, sickbeard.XBMC_USERNAME, sickbeard.XBMC_PASSWORD)
 
             if not request:
-                logger.log(u"XBMC Full Library update failed on: " + host, logger.ERROR)
+                logger.log(u"XBMC: Full Library update failed on: " + host, logger.ERROR)
                 return False
 
         return True
@@ -447,22 +437,22 @@ def _update_library_json(self, host=None, showName=None):
 
     def notify_snatch(self, ep_name):
         if sickbeard.XBMC_NOTIFY_ONSNATCH:
-            self._notify_xbmc(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
+            self._notify(ep_name, common.notifyStrings[common.NOTIFY_SNATCH])
 
     def notify_download(self, ep_name):
         if sickbeard.XBMC_NOTIFY_ONDOWNLOAD:
-            self._notify_xbmc(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
+            self._notify(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
 
     def test_notify(self, host, username, password):
-        return self._notify_xbmc("Testing XBMC notifications from Sick Beard", "Test Notification", host, username, password, force=True)
+        return self._notify("Testing XBMC notifications from Sick Beard", "Test Notification", host, username, password, force=True)
 
-    def update_library(self, showName=None):
+    def update_library(self, ep_obj=None, show_obj=None):
         """Public wrapper for the update library functions to branch the logic for JSON-RPC or legacy HTTP API
 
         Checks the XBMC API version to branch the logic to call either the legacy HTTP API or the newer JSON-RPC over HTTP methods.
-        Do the ability of accepting a list of hosts deliminated by comma, we split off the first host to send the update to.
+        Do the ability of accepting a list of hosts delimited by comma, we split off the first host to send the update to.
         This is a workaround for SQL backend users as updating multiple clients causes duplicate entries.
-        Future plan is to revist how we store the host/ip/username/pw/options so that it may be more flexible.
+        Future plan is to revisit how we store the host/ip/username/pw/options so that it may be more flexible.
 
         Args:
             showName: Name of a TV show to specifically target the library update for
@@ -472,9 +462,16 @@ def update_library(self, showName=None):
 
         """
 
+        if ep_obj:
+            showName = ep_obj.show.name
+        elif show_obj:
+            showName = show_obj.name
+        else:
+            showName = None
+
         if sickbeard.USE_XBMC and sickbeard.XBMC_UPDATE_LIBRARY:
             if not sickbeard.XBMC_HOST:
-                logger.log(u"No XBMC hosts specified, check your settings", logger.DEBUG)
+                logger.log(u"XBMC: No host specified, check your settings", logger.DEBUG)
                 return False
 
             if sickbeard.XBMC_UPDATE_ONLYFIRST:
@@ -485,28 +482,23 @@ def update_library(self, showName=None):
 
             result = 0
             for curHost in [x.strip() for x in host.split(",")]:
-                logger.log(u"Sending request to update library for XBMC host: '" + curHost + "'", logger.MESSAGE)
+                logger.log(u"XBMC: Sending request to update library for host: '" + curHost + "'", logger.MESSAGE)
 
                 xbmcapi = self._get_xbmc_version(curHost, sickbeard.XBMC_USERNAME, sickbeard.XBMC_PASSWORD)
                 if xbmcapi:
                     if (xbmcapi <= 4):
                         # try to update for just the show, if it fails, do full update if enabled
                         if not self._update_library(curHost, showName):
-                            if showName:
-                                logger.log(u"XBMC single show update failed", logger.WARNING)
-                                if  sickbeard.XBMC_UPDATE_FULL:
-                                    logger.log(u"Falling back to XBMC full update")
-                                    self._update_library(curHost)
+                            if showName and sickbeard.XBMC_UPDATE_FULL:
+                                self._update_library(curHost)
                     else:
                         # try to update for just the show, if it fails, do full update if enabled
                         if not self._update_library_json(curHost, showName):
-                            if showName:
-                                logger.log(u"XBMC single show update failed", logger.WARNING)
-                                if  sickbeard.XBMC_UPDATE_FULL:
-                                    logger.log(u"Falling back to XBMC full update")
-                                    self._update_library_json(curHost)
+                            if showName and sickbeard.XBMC_UPDATE_FULL:
+                                self._update_library_json(curHost)
                 else:
-                    logger.log(u"Failed to detect XBMC version for '" + curHost + "', check configuration and try again.", logger.ERROR)
+                    if sickbeard.XBMC_ALWAYS_ON:
+                        logger.log(u"XBMC: Failed to detect XBMC version for '" + curHost + "', check configuration and try again.", logger.ERROR)
                     result = result + 1
 
             # needed for the 'update xbmc' submenu command
diff --git a/sickbeard/nzbget.py b/sickbeard/nzbget.py
index 9f377bc2d1..e66308fbb3 100644
--- a/sickbeard/nzbget.py
+++ b/sickbeard/nzbget.py
@@ -19,7 +19,7 @@
 
 import httplib
 import datetime
-import re
+import urllib
 import urlparse
 
 import sickbeard
@@ -27,35 +27,38 @@
 from base64 import standard_b64encode
 import xmlrpclib
 
+from sickbeard.exceptions import ex
 from sickbeard.providers.generic import GenericProvider
 from sickbeard import config
 from sickbeard import logger
+from common import Quality
 
 
 def sendNZB(nzb):
 
-    addToTop = False
-    nzbgetprio = 0
-
-    if sickbeard.NZBGET_HOST == None:
+    if not sickbeard.NZBGET_HOST:
         logger.log(u"No NZBGet host found in configuration. Please configure it.", logger.ERROR)
         return False
 
-    url = config.clean_url(sickbeard.NZBGET_HOST)
+    nzb_filename = nzb.name + ".nzb"
 
-    if sickbeard.NZBGET_USERNAME or sickbeard.NZBGET_PASSWORD:
-        scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
-        netloc = sickbeard.NZBGET_USERNAME + ":" + sickbeard.NZBGET_PASSWORD + "@" + netloc
-        url = urlparse.urlunsplit((scheme, netloc, path, query, fragment))
+    try:
+        url = config.clean_url(sickbeard.NZBGET_HOST)
 
-    url = urlparse.urljoin(url, "/xmlrpc")
+        scheme, netloc, path, query, fragment = urlparse.urlsplit(url)  # @UnusedVariable
 
-    try:
-        nzbGetRPC = xmlrpclib.ServerProxy(url)
+        if sickbeard.NZBGET_USERNAME or sickbeard.NZBGET_PASSWORD:
+            netloc = urllib.quote_plus(sickbeard.NZBGET_USERNAME.encode("utf-8", 'ignore')) + u":" + urllib.quote_plus(sickbeard.NZBGET_PASSWORD.encode("utf-8", 'ignore')) + u"@" + netloc
 
-        if nzbGetRPC.writelog("INFO", "SickBeard connected to drop off " + nzb.name + ".nzb" + " any moment now."):
-            logger.log(u"Successful connected to NZBGet", logger.DEBUG)
+        url = urlparse.urlunsplit((scheme, netloc, u"/xmlrpc", "", ""))
+
+        logger.log(u"Sending NZB to NZBGet")
+        logger.log(u"NZBGet URL: " + url, logger.DEBUG)
 
+        nzbGetRPC = xmlrpclib.ServerProxy(url.encode("utf-8", 'ignore'))
+
+        if nzbGetRPC.writelog("INFO", "SickBeard connected to drop off " + nzb_filename + " any moment now."):
+            logger.log(u"Successful connected to NZBGet", logger.DEBUG)
         else:
             logger.log(u"Successful connected to NZBGet, but unable to send a message", logger.ERROR)
 
@@ -66,48 +69,89 @@ def sendNZB(nzb):
     except xmlrpclib.ProtocolError, e:
         if (e.errmsg == "Unauthorized"):
             logger.log(u"NZBGet username or password is incorrect.", logger.ERROR)
-
         else:
-            logger.log(u"Protocol Error: " + e.errmsg, logger.ERROR)
+            logger.log(u"NZBGet protocol error: " + e.errmsg, logger.ERROR)
+        return False
 
+    except Exception, e:
+        logger.log(u"NZBGet sendNZB failed. URL: " + url + " Error: " + ex(e), logger.ERROR)
         return False
 
-    # if it aired recently make it high priority
+    # if it aired recently make it high priority and generate dupekey/dupescore
+    add_to_top = False
+    nzbgetprio = dupescore = 0
+    dupekey = ""
+
     for curEp in nzb.episodes:
+        if dupekey == "":
+            dupekey = "SickBeard-" + str(curEp.show.tvdbid)
+
+        dupekey += "-" + str(curEp.season) + "." + str(curEp.episode)
+
         if datetime.date.today() - curEp.airdate <= datetime.timedelta(days=7):
-            addToTop = True
+            add_to_top = True
             nzbgetprio = 100
 
-    # if it's a normal result need to download the NZB content
-    if nzb.resultType == "nzb":
-        genProvider = GenericProvider("")
-        data = genProvider.getURL(nzb.url)
-        if (data == None):
-            return False
+    # tweak dupescore based off quality, higher score wins
+    if nzb.quality != Quality.UNKNOWN:
+        dupescore = nzb.quality * 100
 
-    # if we get a raw data result thats even better
-    elif nzb.resultType == "nzbdata":
-        data = nzb.extraInfo[0]
+    if nzb.quality == Quality.SNATCHED_PROPER:
+        dupescore += 10
 
-    nzbcontent64 = standard_b64encode(data)
+    nzbget_result = None
+    nzbcontent64 = None
 
-    logger.log(u"Sending NZB to NZBGet")
-    logger.log(u"URL: " + url, logger.DEBUG)
+    # if we get a raw data result we encode contents and pass that
+    if nzb.resultType == "nzbdata":
+        data = nzb.extraInfo[0]
+        nzbcontent64 = standard_b64encode(data)
+
+    logger.log(u"Attempting to send NZB to NZBGet (" + sickbeard.NZBGET_CATEGORY + ")", logger.DEBUG)
 
     try:
-        # Find out if nzbget supports priority (Version 9.0+), old versions beginning with a 0.x will use the old command
-        if re.search(r"^0", nzbGetRPC.version()):
-            nzbget_result = nzbGetRPC.append(nzb.name + ".nzb", sickbeard.NZBGET_CATEGORY, addToTop, nzbcontent64)
+        # find out nzbget version to branch logic, 0.8.x and older will return 0
+        nzbget_version_str = nzbGetRPC.version()
+        nzbget_version = config.to_int(nzbget_version_str[:nzbget_version_str.find(".")])
+
+        # v8 and older, no priority or dupe info
+        if nzbget_version == 0:
+            if nzbcontent64:
+                nzbget_result = nzbGetRPC.append(nzb_filename, sickbeard.NZBGET_CATEGORY, add_to_top, nzbcontent64)
+
+            else:
+                # appendurl not supported on older versions, so d/l nzb data from url ourselves
+                if nzb.resultType == "nzb":
+                    genProvider = GenericProvider("")
+                    data = genProvider.getURL(nzb.url)
+
+                    if data:
+                        nzbcontent64 = standard_b64encode(data)
+                        nzbget_result = nzbGetRPC.append(nzb_filename, sickbeard.NZBGET_CATEGORY, add_to_top, nzbcontent64)
+
+        # v12+ pass dupekey + dupescore
+        elif nzbget_version >= 12:
+            if nzbcontent64:
+                nzbget_result = nzbGetRPC.append(nzb_filename, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, nzbcontent64, False, dupekey, dupescore, "score")
+            else:
+                nzbget_result = nzbGetRPC.appendurl(nzb_filename, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, nzb.url, False, dupekey, dupescore, "score")
+
+        # v9+ pass priority, no dupe info
         else:
-            nzbget_result = nzbGetRPC.append(nzb.name + ".nzb", sickbeard.NZBGET_CATEGORY, nzbgetprio, False, nzbcontent64)
+            if nzbcontent64:
+                nzbget_result = nzbGetRPC.append(nzb_filename, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, nzbcontent64)
+            else:
+                nzbget_result = nzbGetRPC.appendurl(nzb_filename, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, nzb.url)
 
         if nzbget_result:
             logger.log(u"NZB sent to NZBGet successfully", logger.DEBUG)
             return True
-
         else:
-            logger.log(u"NZBGet could not add %s to the queue" % (nzb.name + ".nzb"), logger.ERROR)
+            logger.log(u"NZBGet could not add " + nzb_filename + " to the queue", logger.ERROR)
             return False
 
     except:
-        logger.log(u"Connect Error to NZBGet: could not add %s to the queue" % (nzb.name + ".nzb"), logger.ERROR)
+        logger.log(u"Connect Error to NZBGet: could not add " + nzb_filename + " to the queue", logger.ERROR)
+        return False
+
+    return False
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 9b371ce8cb..8ec0368b7a 100644
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -83,12 +83,12 @@ def __init__(self, file_path, nzb_name=None, pp_options={}):
         self.force_replace = pp_options.get('force_replace', False)
 
         self.in_history = False
+
         self.release_group = None
-        self.is_proper = False
 
-        self.good_results = {self.NZB_NAME: False,
-                             self.FOLDER_NAME: False,
-                             self.FILE_NAME: False}
+        self.release_name = None
+
+        self.is_proper = False
 
         self.log = ''
 
@@ -197,8 +197,8 @@ def _delete(self, file_path, associated_files=False):
 
         # delete the file and any other files which we want to delete
         for cur_file in file_list:
-            self._log(u"Deleting file " + cur_file, logger.DEBUG)
             if ek.ek(os.path.isfile, cur_file):
+                self._log(u"Deleting file " + cur_file, logger.DEBUG)
                 ek.ek(os.remove, cur_file)
                 # do the library update for synoindex
                 notifiers.synoindex_notifier.deleteFile(cur_file)
@@ -337,13 +337,6 @@ def _history_lookup(self):
             to_return = (tvdb_id, season, [], quality)
             self._log("Found result in history: " + str(to_return), logger.DEBUG)
 
-            if curName == self.nzb_name:
-                self.good_results[self.NZB_NAME] = True
-            elif curName == self.folder_name:
-                self.good_results[self.FOLDER_NAME] = True
-            elif curName == self.file_name:
-                self.good_results[self.FILE_NAME] = True
-
             return to_return
 
         self.in_history = False
@@ -366,8 +359,10 @@ def _analyze_name(self, name, file_name=True):
         if not name:
             return to_return
 
+        name = helpers.remove_non_release_groups(helpers.remove_extension(name))
+
         # parse the name to break it into show name, season, and episode
-        np = NameParser(file_name)
+        np = NameParser(False)
         parse_result = np.parse(name)
         self._log(u"Parsed " + name + " into " + str(parse_result).decode('utf-8', 'xmlcharrefreplace'), logger.DEBUG)
 
@@ -444,16 +439,10 @@ def _finalize(self, parse_result):
         self.is_proper = parse_result.is_proper
 
         # if the result is complete then remember that for later
-        if parse_result.series_name and parse_result.season_number != None and parse_result.episode_numbers and parse_result.release_group:
-            test_name = ek.ek(os.path.basename, parse_result.original_name)
-            if test_name == self.nzb_name:
-                self.good_results[self.NZB_NAME] = True
-            elif test_name == self.folder_name:
-                self.good_results[self.FOLDER_NAME] = True
-            elif test_name == self.file_name:
-                self.good_results[self.FILE_NAME] = True
-            else:
-                logger.log(u"Nothing was good, found " + repr(test_name) + " and wanted either " + repr(self.nzb_name) + ", " + repr(self.folder_name) + ", or " + repr(self.file_name))
+        if parse_result.series_name and parse_result.season_number is not None and parse_result.episode_numbers and parse_result.release_group:
+            if not self.release_name:
+                self.release_name = helpers.remove_extension(ek.ek(os.path.basename, parse_result.original_name))
+
         else:
             logger.log(u"Parse result not sufficient (all following have to be set). will not save release name", logger.DEBUG)
             logger.log(u"Parse result(series_name): " + str(parse_result.series_name), logger.DEBUG)
@@ -619,7 +608,14 @@ def _get_quality(self, ep_obj):
                 logger.log(cur_name + u" looks like it has quality " + common.Quality.qualityStrings[ep_quality] + ", using that", logger.DEBUG)
                 return ep_quality
 
-        # if we didn't get a quality from one of the names above, try assuming from each of the names
+        # Try getting quality from the episode (snatched) status
+        if ep_obj.status in common.Quality.SNATCHED + common.Quality.SNATCHED_PROPER:
+            oldStatus, ep_quality = common.Quality.splitCompositeStatus(ep_obj.status)  # @UnusedVariable
+            if ep_quality != common.Quality.UNKNOWN:
+                self._log(u"The old status had a quality in it, using that: " + common.Quality.qualityStrings[ep_quality], logger.DEBUG)
+                return ep_quality
+
+        # Try guessing quality from the file name
         ep_quality = common.Quality.assumeQuality(self.file_name)
         self._log(u"Guessing quality for name " + self.file_name + u", got " + common.Quality.qualityStrings[ep_quality], logger.DEBUG)
         if ep_quality != common.Quality.UNKNOWN:
@@ -693,33 +689,47 @@ def _safe_replace(self, ep_obj, new_ep_quality):
             return True
 
         # if the file processed is higher quality than the existing episode then it's safe
-        if new_ep_quality > old_ep_quality and new_ep_quality != common.Quality.UNKNOWN:
-            self._log(u"Existing episode status is not snatched but new file appears to be better quality than existing episode, marking it safe to replace", logger.DEBUG)
-            return True
+        if new_ep_quality > old_ep_quality:
+            if new_ep_quality != common.Quality.UNKNOWN:
+                self._log(u"Existing episode status is not snatched but processed episode appears to be better quality than existing episode, marking it safe to replace", logger.DEBUG)
+                return True
+
+            else:
+                self._log(u"Episode already exists in database and processed episode has unknown quality, marking it unsafe to replace", logger.DEBUG)
+                return False
 
         # if there's an existing downloaded file with same quality, check filesize to decide
         if new_ep_quality == old_ep_quality:
-            self._log(u"File already exists in database and has same quality as new file", logger.DEBUG)
+            self._log(u"Episode already exists in database and has same quality as processed episode", logger.DEBUG)
 
             # check for an existing file
-            self._log(u"Checking existing file size", logger.DEBUG)
+            self._log(u"Checking size of existing file: " + ep_obj.location, logger.DEBUG)
             existing_file_status = self._checkForExistingFile(ep_obj.location)
 
             if existing_file_status in (PostProcessor.EXISTS_LARGER, PostProcessor.EXISTS_SAME):
-                self._log(u"File already exists and new file is same/smaller, marking it unsafe to replace", logger.DEBUG)
+                self._log(u"File exists and new file is same/smaller, marking it unsafe to replace", logger.DEBUG)
                 return False
 
             elif existing_file_status == PostProcessor.EXISTS_SMALLER:
-                self._log(u"File already exists and new file is larger, marking it safe to replace", logger.DEBUG)
+                self._log(u"File exists and new file is larger, marking it safe to replace", logger.DEBUG)
                 return True
 
-            elif existing_file_status != PostProcessor.DOESNT_EXIST:
-                self._log(u"Unknown existing file status. This should never happen, please log this as a bug.", logger.ERROR)
+            elif existing_file_status == PostProcessor.DOESNT_EXIST:
+                if not ek.ek(os.path.isdir, ep_obj.show._location) and not sickbeard.CREATE_MISSING_SHOW_DIRS:
+                    self._log(u"File and Show location doesn't exist, marking it unsafe to replace", logger.DEBUG)
+                    return False
+
+                else:
+                    self._log(u"File doesn't exist, marking it safe to replace", logger.DEBUG)
+                    return True
+
+            else:
+                self._log(u"Unknown file status for: " + ep_obj.location + "This should never happen, please log this as a bug.", logger.ERROR)
                 return False
 
         # if there's an existing file with better quality
         if new_ep_quality < old_ep_quality and old_ep_quality != common.Quality.UNKNOWN:
-            self._log(u"File already exists and new file has lower quality, marking it unsafe to replace", logger.DEBUG)
+            self._log(u"Episode already exists in database and processed episode has lower quality, marking it unsafe to replace", logger.DEBUG)
             return False
 
         self._log(u"None of the conditions were met, marking it unsafe to replace", logger.DEBUG)
@@ -799,33 +809,14 @@ def process(self):
 
         # update the ep info before we rename so the quality & release name go into the name properly
         for cur_ep in [ep_obj] + ep_obj.relatedEps:
-            with cur_ep.lock:
-                cur_release_name = None
-
-                # use the best possible representation of the release name
-                if self.good_results[self.NZB_NAME]:
-                    cur_release_name = self.nzb_name
-                    if cur_release_name.lower().endswith('.nzb'):
-                        cur_release_name = cur_release_name.rpartition('.')[0]
-
-                elif self.good_results[self.FILE_NAME]:
-                    cur_release_name = self.file_name
-                    # take the extension off the filename, it's not needed
-                    if '.' in self.file_name:
-                        cur_release_name = self.file_name.rpartition('.')[0]
-
-                elif self.good_results[self.FOLDER_NAME]:
-                    cur_release_name = self.folder_name
-
-                if cur_release_name:
-                    self._log("Found release name " + cur_release_name, logger.DEBUG)
-                    cur_ep.release_name = cur_release_name
-                else:
-                    logger.log(u"good results: " + repr(self.good_results), logger.DEBUG)
 
-                cur_ep.status = common.Quality.compositeStatus(common.DOWNLOADED, new_ep_quality)
+            if self.release_name:
+                self._log("Found release name " + self.release_name, logger.DEBUG)
+                cur_ep.release_name = self.release_name
+            else:
+                cur_ep.release_name = ""
 
-                cur_ep.saveToDB()
+            cur_ep.status = common.Quality.compositeStatus(common.DOWNLOADED, new_ep_quality)
 
         # find the destination folder
         try:
@@ -871,30 +862,15 @@ def process(self):
         # log it to history
         history.logDownload(ep_obj, self.file_path, new_ep_quality, self.release_group)
 
-        # send notifications
+        # send notifiers download notification
         notifiers.notify_download(ep_obj.prettyName())
 
         # generate nfo/tbn
         ep_obj.createMetaFiles()
         ep_obj.saveToDB()
 
-        # do the library update for XBMC
-        notifiers.xbmc_notifier.update_library(ep_obj.show.name)
-
-        # do the library update for Plex
-        notifiers.plex_notifier.update_library()
-
-        # do the library update for NMJ
-        # nmj_notifier kicks off its library update when the notify_download is issued (inside notifiers)
-
-        # do the library update for Synology Indexer
-        notifiers.synoindex_notifier.addFile(ep_obj.location)
-
-        # do the library update for pyTivo
-        notifiers.pytivo_notifier.update_library(ep_obj)
-
-        # do the library update for Trakt
-        notifiers.trakt_notifier.update_library(ep_obj)
+        # send notifiers library update
+        notifiers.update_library(ep_obj)
 
         self._run_extra_scripts(ep_obj)
 
diff --git a/sickbeard/processTV.py b/sickbeard/processTV.py
index 80005575a0..f2b43c5b80 100644
--- a/sickbeard/processTV.py
+++ b/sickbeard/processTV.py
@@ -103,7 +103,7 @@ def processDir(dirName, nzbName=None, method=None, recurse=False, pp_options={})
     elif ek.ek(os.path.basename, dirName).startswith('_UNDERSIZED_'):
         returnStr += logHelper(u"The directory name indicates that it was previously rejected for being undersized, cancelling", logger.DEBUG)
         return returnStr
-    elif ek.ek(os.path.basename, dirName).startswith('_UNPACK_'):
+    elif ek.ek(os.path.basename, dirName).upper().startswith('_UNPACK'):
         returnStr += logHelper(u"The directory name indicates that this release is in the process of being unpacked, skipping", logger.DEBUG)
         return returnStr
 
@@ -149,6 +149,7 @@ def processDir(dirName, nzbName=None, method=None, recurse=False, pp_options={})
     remainingFolders = filter(lambda x: ek.ek(os.path.isdir, ek.ek(os.path.join, dirName, x)), fileList)
 
     if num_videoFiles == 0:
+        returnStr += u"\n"
         returnStr += logHelper(u"There are no videofiles in folder: " + dirName, logger.DEBUG)
 
         # if there a no videofiles, try deleting empty folder
diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py
index 37785358a3..1a8d041908 100644
--- a/sickbeard/properFinder.py
+++ b/sickbeard/properFinder.py
@@ -48,9 +48,6 @@ def run(self):
 
         # look for propers every night at 1 AM
         updateTime = datetime.time(hour=1)
-
-        logger.log(u"Checking proper time", logger.DEBUG)
-
         hourDiff = datetime.datetime.today().time().hour - updateTime.hour
 
         # if it's less than an interval after the update time then do an update
diff --git a/sickbeard/scheduler.py b/sickbeard/scheduler.py
index a0973d5209..e7816f9859 100644
--- a/sickbeard/scheduler.py
+++ b/sickbeard/scheduler.py
@@ -24,14 +24,12 @@
 from sickbeard import logger
 from sickbeard.exceptions import ex
 
+
 class Scheduler:
 
-    def __init__(self, action, cycleTime=datetime.timedelta(minutes=10), runImmediately=True, threadName="ScheduledThread", silent=False):
+    def __init__(self, action, cycleTime=datetime.timedelta(minutes=10), run_delay=datetime.timedelta(minutes=0), threadName="ScheduledThread", silent=False):
 
-        if runImmediately:
-            self.lastRun = datetime.datetime.fromordinal(1)
-        else:
-            self.lastRun = datetime.datetime.now()
+        self.lastRun = datetime.datetime.now() + run_delay - cycleTime
 
         self.action = action
         self.cycleTime = cycleTime
@@ -63,14 +61,14 @@ def runAction(self):
 
             currentTime = datetime.datetime.now()
 
-            if currentTime - self.lastRun > self.cycleTime:
+            if currentTime - self.lastRun >= self.cycleTime:
                 self.lastRun = currentTime
                 try:
                     if not self.silent:
-                        logger.log(u"Starting new thread: "+self.threadName, logger.DEBUG)
+                        logger.log(u"Starting new thread: " + self.threadName, logger.DEBUG)
                     self.action.run()
                 except Exception, e:
-                    logger.log(u"Exception generated in thread "+self.threadName+": " + ex(e), logger.ERROR)
+                    logger.log(u"Exception generated in thread " + self.threadName + ": " + ex(e), logger.ERROR)
                     logger.log(repr(traceback.format_exc()), logger.DEBUG)
 
             if self.abort:
diff --git a/sickbeard/showUpdater.py b/sickbeard/showUpdater.py
index 8e0324b519..0e884dd339 100644
--- a/sickbeard/showUpdater.py
+++ b/sickbeard/showUpdater.py
@@ -41,9 +41,6 @@ def run(self, force=False):
 
         update_datetime = datetime.datetime.today()
         update_date = update_datetime.date()
-
-        logger.log(u"Checking update interval", logger.DEBUG)
-
         hour_diff = update_datetime.time().hour - run_updater_time.hour
 
         # if it's less than an interval after the update time then do an update (or if we're forcing it)
diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py
index 0939478db6..3130cf1720 100644
--- a/sickbeard/show_name_helpers.py
+++ b/sickbeard/show_name_helpers.py
@@ -29,7 +29,7 @@
 
 from name_parser.parser import NameParser, InvalidNameException
 
-resultFilters = ["sub(pack|s|bed)", "nlsub(bed|s)?", "swesub(bed)?",
+resultFilters = ["sub(bed|ed|pack|s)", "(dk|fin|heb|kor|nl|nor|nordic|pl|swe)sub(bed|ed|s)?",
                  "(dir|sample|sub|nfo)fix", "sample", "(dvd)?extras",
                  "dub(bed)?"]
 
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index 7ca977f201..ac785f7a02 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -292,20 +292,20 @@ def loadEpisodesFromDir(self):
             if curEpisode is None:
                 continue
 
-            # see if we should save the release name in the db
-            ep_file_name = ek.ek(os.path.basename, curEpisode.location)
-            ep_file_name = ek.ek(os.path.splitext, ep_file_name)[0]
+            if not curEpisode.release_name:
+                ep_file_name = ek.ek(os.path.basename, curEpisode.location)
+                ep_base_name = helpers.remove_non_release_groups(helpers.remove_extension(ep_file_name))
 
-            parse_result = None
-            try:
-                np = NameParser(False)
-                parse_result = np.parse(ep_file_name)
-            except InvalidNameException:
-                pass
+                parse_result = None
+                try:
+                    np = NameParser(False)
+                    parse_result = np.parse(ep_base_name)
+                except InvalidNameException:
+                    pass
 
-            if not ' ' in ep_file_name and parse_result and parse_result.release_group:
-                logger.log(u"Name " + ep_file_name + u" gave release group of " + parse_result.release_group + ", seems valid", logger.DEBUG)
-                curEpisode.release_name = ep_file_name
+                if not ' ' in ep_base_name and parse_result and parse_result.release_group:
+                    logger.log(u"Name " + ep_base_name + u" gave release group of " + parse_result.release_group + ", seems valid", logger.DEBUG)
+                    curEpisode.release_name = ep_base_name
 
             # store the reference in the show
             if curEpisode != None:
@@ -1446,24 +1446,28 @@ def us(name):
             return re.sub('[ -]', '_', name)
 
         def release_name(name):
-            if name and name.lower().endswith('.nzb'):
-                name = name.rpartition('.')[0]
+            if name:
+                name = helpers.remove_non_release_groups(helpers.remove_extension(name))
             return name
 
         def release_group(name):
-            if not name:
-                return ''
 
-            np = NameParser(name)
+            if name:
+                name = helpers.remove_non_release_groups(helpers.remove_extension(name))
+            else:
+                return ""
+
+            np = NameParser(False)
 
             try:
                 parse_result = np.parse(name)
             except InvalidNameException, e:
                 logger.log(u"Unable to get parse release_group: " + ex(e), logger.DEBUG)
-                return ''
+                return ""
 
             if not parse_result.release_group:
-                return ''
+                return ""
+
             return parse_result.release_group
 
         epStatus, epQual = Quality.splitCompositeStatus(self.status)  # @UnusedVariable
diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py
index 1123388b52..591b92dc6a 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/versionChecker.py
@@ -19,27 +19,27 @@
 from __future__ import with_statement
 
 import sickbeard
-from sickbeard import helpers
+from sickbeard import helpers
 from sickbeard import version, ui
 from sickbeard import logger
 from sickbeard import scene_exceptions
 from sickbeard.exceptions import ex
-from sickbeard import encodingKludge as ek
-
-import os
-import platform
-import shutil
-import subprocess
-import re
-
-import urllib
-
-import zipfile
-import tarfile
+from sickbeard import encodingKludge as ek
+
+import os
+import platform
+import shutil
+import subprocess
+import re
+
+import urllib
+
+import zipfile
+import tarfile
 
 import gh_api as github
 
-
+
 class CheckVersion():
     """
     Version check class meant to run as a thread object with the SB scheduler.
@@ -59,25 +59,25 @@ def __init__(self):
 
     def run(self):
         self.check_for_new_version()
-
+
         # refresh scene exceptions too
         scene_exceptions.retrieve_exceptions()
 
     def find_install_type(self):
         """
         Determines how this copy of SB was installed.
-
+
         returns: type of installation. Possible values are:
             'win': any compiled windows build
             'git': running from source using git
             'source': running from source without git
-        """
-
-        # check if we're a windows build
-        if sickbeard.version.SICKBEARD_VERSION.startswith('build '):
-            install_type = 'win'
-        elif os.path.isdir(ek.ek(os.path.join, sickbeard.PROG_DIR, u'.git')):
-            install_type = 'git'
+        """
+
+        # check if we're a windows build
+        if sickbeard.version.SICKBEARD_VERSION.startswith('build '):
+            install_type = 'win'
+        elif os.path.isdir(ek.ek(os.path.join, sickbeard.PROG_DIR, u'.git')):
+            install_type = 'git'
         else:
             install_type = 'source'
 
@@ -86,9 +86,9 @@ def find_install_type(self):
     def check_for_new_version(self, force=False):
         """
         Checks the internet for a newer version.
-
+
         returns: bool, True for new version or False for no new version.
-
+
         force: if true the VERSION_NOTIFY setting will be ignored and a check will be forced
         """
 
@@ -96,11 +96,11 @@ def check_for_new_version(self, force=False):
             logger.log(u"Version checking is disabled, not checking for the newest version")
             return False
 
-        logger.log(u"Checking if " + self.install_type + " needs an update")
+        logger.log(u"Checking if " + self.install_type + " needs an update")
         if not self.updater.need_update():
-            sickbeard.NEWEST_VERSION_STRING = None
+            sickbeard.NEWEST_VERSION_STRING = None
             logger.log(u"No update needed")
-
+
             if force:
                 ui.notifications.message('No update needed')
             return False
@@ -112,40 +112,40 @@ def update(self):
         if self.updater.need_update():
             return self.updater.update()
 
-
+
 class UpdateManager():
-
-    def get_github_repo_user(self):
-        return 'midgetspy'
-
-    def get_github_repo(self):
-        return 'Sick-Beard'
-
-    def get_update_url(self):
-        return sickbeard.WEB_ROOT + "/home/update/?pid=" + str(sickbeard.PID)
-
+
+    def get_github_repo_user(self):
+        return 'midgetspy'
+
+    def get_github_repo(self):
+        return 'Sick-Beard'
+
+    def get_update_url(self):
+        return sickbeard.WEB_ROOT + "/home/update/?pid=" + str(sickbeard.PID)
+
 
 class WindowsUpdateManager(UpdateManager):
 
     def __init__(self):
-        self.github_repo_user = self.get_github_repo_user()
-        self.github_repo = self.get_github_repo()
-        self.branch = 'windows_binaries'
-
+        self.github_repo_user = self.get_github_repo_user()
+        self.github_repo = self.get_github_repo()
+        self.branch = 'windows_binaries'
+
         self._cur_version = None
-        self._cur_commit_hash = None
+        self._cur_commit_hash = None
         self._newest_version = None
 
-        self.gc_url = 'http://code.google.com/p/sickbeard/downloads/list'
-        self.version_url = 'https://raw.github.com/' + self.github_repo_user + '/' + self.github_repo + '/' + self.branch + '/updates.txt'
+        self.releases_url = "https://github.com/" + self.github_repo_user + "/" + self.github_repo + "/" + "releases" + "/"
+        self.version_url = "https://raw.github.com/" + self.github_repo_user + "/" + self.github_repo + "/" + self.branch + "/updates.txt"
 
     def _find_installed_version(self):
-        try:
-            version = sickbeard.version.SICKBEARD_VERSION
-            return int(version[6:])
-        except ValueError:
-            logger.log(u"Unknown SickBeard Windows binary release: " + version, logger.ERROR)
-            return None
+        try:
+            version = sickbeard.version.SICKBEARD_VERSION
+            return int(version[6:])
+        except ValueError:
+            logger.log(u"Unknown SickBeard Windows binary release: " + version, logger.ERROR)
+            return None
 
     def _find_newest_version(self, whole_link=False):
         """
@@ -158,20 +158,20 @@ def _find_newest_version(self, whole_link=False):
 
         regex = ".*SickBeard\-win32\-alpha\-build(\d+)(?:\.\d+)?\.zip"
 
-        version_url_data = helpers.getURL(self.version_url)
-
-        if version_url_data is None:
-            return None
-        else:
-            for curLine in version_url_data.splitlines():
-                logger.log(u"checking line " + curLine, logger.DEBUG)
-                match = re.match(regex, curLine)
-                if match:
-                    logger.log(u"found a match", logger.DEBUG)
-                    if whole_link:
-                        return curLine.strip()
-                    else:
-                        return int(match.group(1))
+        version_url_data = helpers.getURL(self.version_url)
+
+        if version_url_data is None:
+            return None
+        else:
+            for curLine in version_url_data.splitlines():
+                logger.log(u"checking line " + curLine, logger.DEBUG)
+                match = re.match(regex, curLine)
+                if match:
+                    logger.log(u"found a match", logger.DEBUG)
+                    if whole_link:
+                        return curLine.strip()
+                    else:
+                        return int(match.group(1))
 
         return None
 
@@ -179,191 +179,198 @@ def need_update(self):
         self._cur_version = self._find_installed_version()
         self._newest_version = self._find_newest_version()
 
-        logger.log(u"newest version: " + repr(self._newest_version), logger.DEBUG)
+        logger.log(u"newest version: " + repr(self._newest_version), logger.DEBUG)
 
         if self._newest_version and self._newest_version > self._cur_version:
             return True
 
+        return False
+
     def set_newest_text(self):
 
-        sickbeard.NEWEST_VERSION_STRING = None
-
-        if not self._cur_version:
-            newest_text = "Unknown SickBeard Windows binary version. Not updating with original version."
-        else:
-            newest_text = 'There is a <a href="' + self.gc_url + '" onclick="window.open(this.href); return false;">newer version available</a> (build ' + str(self._newest_version) + ')'
-            newest_text += "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
-
-        sickbeard.NEWEST_VERSION_STRING = newest_text
+        sickbeard.NEWEST_VERSION_STRING = None
+
+        if not self._cur_version:
+            newest_text = "Unknown SickBeard Windows binary version. Not updating with original version."
+        else:
+            newest_text = 'There is a <a href="' + self.releases_url + '" onclick="window.open(this.href); return false;">newer version available</a> (build ' + str(self._newest_version) + ')'
+            newest_text += "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
+
+        sickbeard.NEWEST_VERSION_STRING = newest_text
 
-    def update(self):
+    def update(self):
 
-        zip_download_url = self._find_newest_version(True)
-        logger.log(u"new_link: " + repr(zip_download_url), logger.DEBUG)
+        zip_download_url = self._find_newest_version(True)
+        logger.log(u"new_link: " + repr(zip_download_url), logger.DEBUG)
 
-        if not zip_download_url:
-            logger.log(u"Unable to find a new version link on google code, not updating")
+        if not zip_download_url:
+            logger.log(u"Unable to find a new version link, not updating")
             return False
 
         try:
             # prepare the update dir
-            sb_update_dir = ek.ek(os.path.join, sickbeard.PROG_DIR, u'sb-update')
-
+            sb_update_dir = ek.ek(os.path.join, sickbeard.PROG_DIR, u'sb-update')
+
             if os.path.isdir(sb_update_dir):
-                logger.log(u"Clearing out update folder " + sb_update_dir + " before extracting")
+                logger.log(u"Clearing out update folder " + sb_update_dir + " before extracting")
                 shutil.rmtree(sb_update_dir)
 
-            logger.log(u"Creating update folder " + sb_update_dir + " before extracting")
-            os.makedirs(sb_update_dir)
-
-            # retrieve file
-            logger.log(u"Downloading update from " + zip_download_url)
-            zip_download_path = os.path.join(sb_update_dir, u'sb-update.zip')
-            urllib.urlretrieve(zip_download_url, zip_download_path)
-
-            if not ek.ek(os.path.isfile, zip_download_path):
-                logger.log(u"Unable to retrieve new version from " + zip_download_url + ", can't update", logger.ERROR)
-                return False
-
-            # extract to sb-update dir
-            logger.log(u"Unzipping from " + str(zip_download_path) + " to " + sb_update_dir)
-            update_zip = zipfile.ZipFile(zip_download_path, 'r')
+            logger.log(u"Creating update folder " + sb_update_dir + " before extracting")
+            os.makedirs(sb_update_dir)
+
+            # retrieve file
+            logger.log(u"Downloading update from " + zip_download_url)
+            zip_download_path = os.path.join(sb_update_dir, u'sb-update.zip')
+            urllib.urlretrieve(zip_download_url, zip_download_path)
+
+            if not ek.ek(os.path.isfile, zip_download_path):
+                logger.log(u"Unable to retrieve new version from " + zip_download_url + ", can't update", logger.ERROR)
+                return False
+
+            if not ek.ek(zipfile.is_zipfile, zip_download_path):
+                logger.log(u"Retrieved version from " + zip_download_url + " is corrupt, can't update", logger.ERROR)
+                return False
+
+            # extract to sb-update dir
+            logger.log(u"Unzipping from " + str(zip_download_path) + " to " + sb_update_dir)
+            update_zip = zipfile.ZipFile(zip_download_path, 'r')
             update_zip.extractall(sb_update_dir)
             update_zip.close()
-
-            # delete the zip
-            logger.log(u"Deleting zip file from " + str(zip_download_path))
-            os.remove(zip_download_path)
-
+
+            # delete the zip
+            logger.log(u"Deleting zip file from " + str(zip_download_path))
+            os.remove(zip_download_path)
+
             # find update dir name
-            update_dir_contents = [x for x in os.listdir(sb_update_dir) if os.path.isdir(os.path.join(sb_update_dir, x))]
-
+            update_dir_contents = [x for x in os.listdir(sb_update_dir) if os.path.isdir(os.path.join(sb_update_dir, x))]
+
             if len(update_dir_contents) != 1:
-                logger.log(u"Invalid update data, update failed. Maybe try deleting your sb-update folder?", logger.ERROR)
+                logger.log(u"Invalid update data, update failed. Maybe try deleting your sb-update folder?", logger.ERROR)
                 return False
 
             content_dir = os.path.join(sb_update_dir, update_dir_contents[0])
-            old_update_path = os.path.join(content_dir, u'updater.exe')
-            new_update_path = os.path.join(sickbeard.PROG_DIR, u'updater.exe')
-            logger.log(u"Copying new update.exe file from " + old_update_path + " to " + new_update_path)
+            old_update_path = os.path.join(content_dir, u'updater.exe')
+            new_update_path = os.path.join(sickbeard.PROG_DIR, u'updater.exe')
+            logger.log(u"Copying new update.exe file from " + old_update_path + " to " + new_update_path)
             shutil.move(old_update_path, new_update_path)
 
         except Exception, e:
-            logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
+            logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
             return False
 
         return True
 
-
-class GitUpdateManager(UpdateManager):
-
-    def __init__(self):
-        self._git_path = self._find_working_git()
-        self.github_repo_user = self.get_github_repo_user()
-        self.github_repo = self.get_github_repo()
-        self.branch = self._find_git_branch()
-
-        self._cur_commit_hash = None
-        self._newest_commit_hash = None
-        self._num_commits_behind = 0
-
-    def _git_error(self):
-        error_message = 'Unable to find your git executable - Shutdown SickBeard and EITHER <a href="http://code.google.com/p/sickbeard/wiki/AdvancedSettings" onclick="window.open(this.href); return false;">set git_path in your config.ini</a> OR delete your .git folder and run from source to enable updates.'
-        sickbeard.NEWEST_VERSION_STRING = error_message
-
-    def _find_working_git(self):
-        test_cmd = 'version'
-
-        if sickbeard.GIT_PATH:
-            main_git = '"' + sickbeard.GIT_PATH + '"'
-        else:
-            main_git = 'git'
-
-        logger.log(u"Checking if we can use git commands: " + main_git + ' ' + test_cmd, logger.DEBUG)
-        output, err, exit_status = self._run_git(main_git, test_cmd)  # @UnusedVariable
-
-        if exit_status == 0:
-            logger.log(u"Using: " + main_git, logger.DEBUG)
-            return main_git
-        else:
-            logger.log(u"Not using: " + main_git, logger.DEBUG)
-
-        # trying alternatives
-
-        alternative_git = []
-
-        # osx people who start SB from launchd have a broken path, so try a hail-mary attempt for them
-        if platform.system().lower() == 'darwin':
-            alternative_git.append('/usr/local/git/bin/git')
-
-        if platform.system().lower() == 'windows':
-            if main_git != main_git.lower():
-                alternative_git.append(main_git.lower())
-
-        if alternative_git:
-            logger.log(u"Trying known alternative git locations", logger.DEBUG)
-
-            for cur_git in alternative_git:
-                logger.log(u"Checking if we can use git commands: " + cur_git + ' ' + test_cmd, logger.DEBUG)
-                output, err, exit_status = self._run_git(cur_git, test_cmd)  # @UnusedVariable
-
-                if exit_status == 0:
-                    logger.log(u"Using: " + cur_git, logger.DEBUG)
-                    return cur_git
-                else:
-                    logger.log(u"Not using: " + cur_git, logger.DEBUG)
-
-        # Still haven't found a working git
-        error_message = 'Unable to find your git executable - Shutdown SickBeard and EITHER <a href="http://code.google.com/p/sickbeard/wiki/AdvancedSettings" onclick="window.open(this.href); return false;">set git_path in your config.ini</a> OR delete your .git folder and run from source to enable updates.'
-        sickbeard.NEWEST_VERSION_STRING = error_message
-
-        return None
-
-    def _run_git(self, git_path, args):
-
-        output = err = exit_status = None
-
-        if not git_path:
-            logger.log(u"No git specified, can't use git commands", logger.ERROR)
-            exit_status = 1
-            return (output, err, exit_status)
-
-        cmd = git_path + ' ' + args
-
-        try:
-            logger.log(u"Executing " + cmd + " with your shell in " + sickbeard.PROG_DIR, logger.DEBUG)
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=sickbeard.PROG_DIR)
-            output, err = p.communicate()
-            exit_status = p.returncode
-
-            if output:
-                output = output.strip()
-            logger.log(u"git output: " + output, logger.DEBUG)
-
-        except OSError:
-            logger.log(u"Command " + cmd + " didn't work")
-            exit_status = 1
-
-        if exit_status == 0:
-            logger.log(cmd + u" : returned successful", logger.DEBUG)
-            exit_status = 0
-
-        elif exit_status == 1:
-            logger.log(cmd + u" returned : " + output, logger.ERROR)
-            exit_status = 1
-
-        elif exit_status == 128 or 'fatal:' in output or err:
-            logger.log(cmd + u" returned : " + output, logger.ERROR)
-            exit_status = 128
-
-        else:
-            logger.log(cmd + u" returned : " + output + u", treat as error for now", logger.ERROR)
-            exit_status = 1
-
-        return (output, err, exit_status)
-
-    def _find_installed_version(self):
-        """
+
+class GitUpdateManager(UpdateManager):
+
+    def __init__(self):
+        self._git_path = self._find_working_git()
+        self.github_repo_user = self.get_github_repo_user()
+        self.github_repo = self.get_github_repo()
+        self.branch = self._find_git_branch()
+
+        self._cur_commit_hash = None
+        self._newest_commit_hash = None
+        self._num_commits_behind = 0
+        self._num_commits_ahead = 0
+
+    def _git_error(self):
+        error_message = 'Unable to find your git executable - Shutdown SickBeard and EITHER <a href="http://code.google.com/p/sickbeard/wiki/AdvancedSettings" onclick="window.open(this.href); return false;">set git_path in your config.ini</a> OR delete your .git folder and run from source to enable updates.'
+        sickbeard.NEWEST_VERSION_STRING = error_message
+
+    def _find_working_git(self):
+        test_cmd = 'version'
+
+        if sickbeard.GIT_PATH:
+            main_git = '"' + sickbeard.GIT_PATH + '"'
+        else:
+            main_git = 'git'
+
+        logger.log(u"Checking if we can use git commands: " + main_git + ' ' + test_cmd, logger.DEBUG)
+        output, err, exit_status = self._run_git(main_git, test_cmd)  # @UnusedVariable
+
+        if exit_status == 0:
+            logger.log(u"Using: " + main_git, logger.DEBUG)
+            return main_git
+        else:
+            logger.log(u"Not using: " + main_git, logger.DEBUG)
+
+        # trying alternatives
+
+        alternative_git = []
+
+        # osx people who start SB from launchd have a broken path, so try a hail-mary attempt for them
+        if platform.system().lower() == 'darwin':
+            alternative_git.append('/usr/local/git/bin/git')
+
+        if platform.system().lower() == 'windows':
+            if main_git != main_git.lower():
+                alternative_git.append(main_git.lower())
+
+        if alternative_git:
+            logger.log(u"Trying known alternative git locations", logger.DEBUG)
+
+            for cur_git in alternative_git:
+                logger.log(u"Checking if we can use git commands: " + cur_git + ' ' + test_cmd, logger.DEBUG)
+                output, err, exit_status = self._run_git(cur_git, test_cmd)  # @UnusedVariable
+
+                if exit_status == 0:
+                    logger.log(u"Using: " + cur_git, logger.DEBUG)
+                    return cur_git
+                else:
+                    logger.log(u"Not using: " + cur_git, logger.DEBUG)
+
+        # Still haven't found a working git
+        error_message = 'Unable to find your git executable - Shutdown SickBeard and EITHER <a href="http://code.google.com/p/sickbeard/wiki/AdvancedSettings" onclick="window.open(this.href); return false;">set git_path in your config.ini</a> OR delete your .git folder and run from source to enable updates.'
+        sickbeard.NEWEST_VERSION_STRING = error_message
+
+        return None
+
+    def _run_git(self, git_path, args):
+
+        output = err = exit_status = None
+
+        if not git_path:
+            logger.log(u"No git specified, can't use git commands", logger.ERROR)
+            exit_status = 1
+            return (output, err, exit_status)
+
+        cmd = git_path + ' ' + args
+
+        try:
+            logger.log(u"Executing " + cmd + " with your shell in " + sickbeard.PROG_DIR, logger.DEBUG)
+            p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=sickbeard.PROG_DIR)
+            output, err = p.communicate()
+            exit_status = p.returncode
+
+            if output:
+                output = output.strip()
+            logger.log(u"git output: " + output, logger.DEBUG)
+
+        except OSError:
+            logger.log(u"Command " + cmd + " didn't work")
+            exit_status = 1
+
+        if exit_status == 0:
+            logger.log(cmd + u" : returned successful", logger.DEBUG)
+            exit_status = 0
+
+        elif exit_status == 1:
+            logger.log(cmd + u" returned : " + output, logger.ERROR)
+            exit_status = 1
+
+        elif exit_status == 128 or 'fatal:' in output or err:
+            logger.log(cmd + u" returned : " + output, logger.ERROR)
+            exit_status = 128
+
+        else:
+            logger.log(cmd + u" returned : " + output + u", treat as error for now", logger.ERROR)
+            exit_status = 1
+
+        return (output, err, exit_status)
+
+    def _find_installed_version(self):
+        """
         Attempts to find the currently installed version of Sick Beard.
 
         Uses git show to get commit version.
@@ -371,96 +378,117 @@ def _find_installed_version(self):
         Returns: True for success or False for failure
         """
 
-        output, err, exit_status = self._run_git(self._git_path, 'rev-parse HEAD')  # @UnusedVariable
+        output, err, exit_status = self._run_git(self._git_path, 'rev-parse HEAD')  # @UnusedVariable
 
-        if exit_status == 0 and output:
-            cur_commit_hash = output.strip()
-            if not re.match('^[a-z0-9]+$', cur_commit_hash):
-                logger.log(u"Output doesn't look like a hash, not using it", logger.ERROR)
-                return False
-            self._cur_commit_hash = cur_commit_hash
-            return True
-        else:
-            return False
+        if exit_status == 0 and output:
+            cur_commit_hash = output.strip()
+            if not re.match('^[a-z0-9]+$', cur_commit_hash):
+                logger.log(u"Output doesn't look like a hash, not using it", logger.ERROR)
+                return False
+            self._cur_commit_hash = cur_commit_hash
+            return True
+        else:
+            return False
 
     def _find_git_branch(self):
-        branch_info, err, exit_status = self._run_git(self._git_path, 'symbolic-ref -q HEAD')  # @UnusedVariable
-        if exit_status == 0 and branch_info:
-            branch = branch_info.strip().replace('refs/heads/', '', 1)
-            if branch:
-                sickbeard.version.SICKBEARD_VERSION = branch
-        return sickbeard.version.SICKBEARD_VERSION
+        branch_info, err, exit_status = self._run_git(self._git_path, 'symbolic-ref -q HEAD')  # @UnusedVariable
+        if exit_status == 0 and branch_info:
+            branch = branch_info.strip().replace('refs/heads/', '', 1)
+            if branch:
+                sickbeard.version.SICKBEARD_VERSION = branch
+        return sickbeard.version.SICKBEARD_VERSION
 
     def _check_github_for_update(self):
         """
-        Uses pygithub to ask github if there is a newer version that the provided
-        commit hash. If there is a newer version it sets Sick Beard's version text.
-
-        commit_hash: hash that we're checking against
+        Uses git commands to check if there is a newer version that the provided
+        commit hash. If there is a newer version it sets _num_commits_behind.
         """
 
-        self._num_commits_behind = 0
         self._newest_commit_hash = None
+        self._num_commits_behind = 0
+        self._num_commits_ahead = 0
 
-        gh = github.GitHub(self.github_repo_user, self.github_repo, self.branch)
+        # get all new info from github
+        output, err, exit_status = self._run_git(self._git_path, 'fetch origin')  # @UnusedVariable
 
-        # find newest commit
-        for curCommit in gh.commits():
-            if not self._newest_commit_hash:
-                self._newest_commit_hash = curCommit['sha']
-                if not self._cur_commit_hash:
-                    break
+        if not exit_status == 0:
+            logger.log(u"Unable to contact github, can't check for update", logger.ERROR)
+            return
+
+        # get latest commit_hash from remote
+        output, err, exit_status = self._run_git(self._git_path, 'rev-parse --verify --quiet "@{upstream}"')  # @UnusedVariable
+
+        if exit_status == 0 and output:
+            cur_commit_hash = output.strip()
+
+            if not re.match('^[a-z0-9]+$', cur_commit_hash):
+                logger.log(u"Output doesn't look like a hash, not using it", logger.DEBUG)
+                return
+
+            else:
+                self._newest_commit_hash = cur_commit_hash
+        else:
+            logger.log(u"git didn't return newest commit hash", logger.DEBUG)
+            return
+
+        # get number of commits behind and ahead (option --count not supported git < 1.7.2)
+        output, err, exit_status = self._run_git(self._git_path, 'rev-list --left-right "@{upstream}"...HEAD')  # @UnusedVariable
 
-            if curCommit['sha'] == self._cur_commit_hash:
-                break
+        if exit_status == 0 and output:
 
-            self._num_commits_behind += 1
+            try:
+                self._num_commits_behind = int(output.count("<"))
+                self._num_commits_ahead = int(output.count(">"))
+
+            except:
+                logger.log(u"git didn't return numbers for behind and ahead, not using it", logger.DEBUG)
+                return
 
-        logger.log(u"newest: " + str(self._newest_commit_hash) + " and current: " + str(self._cur_commit_hash) + " and num_commits: " + str(self._num_commits_behind), logger.DEBUG)
+        logger.log(u"cur_commit = " + str(self._cur_commit_hash) + u", newest_commit = " + str(self._newest_commit_hash)
+                   + u", num_commits_behind = " + str(self._num_commits_behind) + u", num_commits_ahead = " + str(self._num_commits_ahead), logger.DEBUG)
 
     def set_newest_text(self):
 
         # if we're up to date then don't set this
-        sickbeard.NEWEST_VERSION_STRING = None
-
-        if self._num_commits_behind == 100:
-            newest_text = "You are ahead of " + self.branch + ". Update not possible."
+        sickbeard.NEWEST_VERSION_STRING = None
+
+        if self._num_commits_ahead:
+            logger.log(u"Local branch is ahead of " + self.branch + ". Automatic update not possible.", logger.ERROR)
+            newest_text = "Local branch is ahead of " + self.branch + ". Automatic update not possible."
 
         elif self._num_commits_behind > 0:
 
-            base_url = 'http://github.com/' + self.github_repo_user + '/' + self.github_repo
-            if self._newest_commit_hash:
-                url = base_url + '/compare/' + self._cur_commit_hash + '...' + self._newest_commit_hash
-            else:
-                url = base_url + '/commits/'
+            base_url = 'http://github.com/' + self.github_repo_user + '/' + self.github_repo
+            if self._newest_commit_hash:
+                url = base_url + '/compare/' + self._cur_commit_hash + '...' + self._newest_commit_hash
+            else:
+                url = base_url + '/commits/'
 
-            newest_text = 'There is a <a href="' + url + '" onclick="window.open(this.href); return false;">newer version available</a> '
-            newest_text += " (you're " + str(self._num_commits_behind) + " commit"
-            if self._num_commits_behind > 1:
-                newest_text += 's'
-            newest_text += ' behind)' + "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
+            newest_text = 'There is a <a href="' + url + '" onclick="window.open(this.href); return false;">newer version available</a> '
+            newest_text += " (you're " + str(self._num_commits_behind) + " commit"
+            if self._num_commits_behind > 1:
+                newest_text += 's'
+            newest_text += ' behind)' + "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
 
-        else:
-            return
+        else:
+            return
 
-        sickbeard.NEWEST_VERSION_STRING = newest_text
+        sickbeard.NEWEST_VERSION_STRING = newest_text
 
     def need_update(self):
-        self._find_installed_version()
+        self._find_installed_version()
 
-        if not self._cur_commit_hash:
+        if not self._cur_commit_hash:
             return True
-        else:
-            try:
-                self._check_github_for_update()
-            except Exception, e:
-                logger.log(u"Unable to contact github, can't check for update: " + repr(e), logger.ERROR)
-                return False
-
-            logger.log(u"After checking, cur_commit = " + str(self._cur_commit_hash) + u", newest_commit = " + str(self._newest_commit_hash) + u", num_commits_behind = " + str(self._num_commits_behind), logger.DEBUG)
-
-            if self._num_commits_behind > 0:
-                return True
+        else:
+            try:
+                self._check_github_for_update()
+            except Exception, e:
+                logger.log(u"Unable to contact github, can't check for update: " + repr(e), logger.ERROR)
+                return False
+
+            if self._num_commits_behind > 0:
+                return True
 
         return False
 
@@ -470,30 +498,30 @@ def update(self):
         on the call's success.
         """
 
-        output, err, exit_status = self._run_git(self._git_path, 'pull origin ' + self.branch)  # @UnusedVariable
+        output, err, exit_status = self._run_git(self._git_path, 'pull origin ' + self.branch)  # @UnusedVariable
 
-        if exit_status == 0:
-            return True
-        else:
-            return False
+        if exit_status == 0:
+            return True
+        else:
+            return False
 
-        return False
+        return False
 
 
-class SourceUpdateManager(UpdateManager):
+class SourceUpdateManager(UpdateManager):
 
-    def __init__(self):
-        self.github_repo_user = self.get_github_repo_user()
-        self.github_repo = self.get_github_repo()
-        self.branch = sickbeard.version.SICKBEARD_VERSION
+    def __init__(self):
+        self.github_repo_user = self.get_github_repo_user()
+        self.github_repo = self.get_github_repo()
+        self.branch = sickbeard.version.SICKBEARD_VERSION
 
-        self._cur_commit_hash = None
-        self._newest_commit_hash = None
-        self._num_commits_behind = 0
+        self._cur_commit_hash = None
+        self._newest_commit_hash = None
+        self._num_commits_behind = 0
 
-    def _find_installed_version(self):
+    def _find_installed_version(self):
 
-        version_file = ek.ek(os.path.join, sickbeard.PROG_DIR, u'version.txt')
+        version_file = ek.ek(os.path.join, sickbeard.PROG_DIR, u'version.txt')
 
         if not os.path.isfile(version_file):
             self._cur_commit_hash = None
@@ -509,143 +537,160 @@ def _find_installed_version(self):
             self._cur_commit_hash = None
 
     def need_update(self):
-
-        self._find_installed_version()
-
-        try:
-            self._check_github_for_update()
-        except Exception, e:
-            logger.log(u"Unable to contact github, can't check for update: " + repr(e), logger.ERROR)
-            return False
-
-        logger.log(u"After checking, cur_commit = " + str(self._cur_commit_hash) + u", newest_commit = " + str(self._newest_commit_hash) + u", num_commits_behind = " + str(self._num_commits_behind), logger.DEBUG)
-
-        if not self._cur_commit_hash or self._num_commits_behind > 0:
-            return True
-
-        return False
-
-    def _check_github_for_update(self):
-        """
-        Uses pygithub to ask github if there is a newer version that the provided
-        commit hash. If there is a newer version it sets Sick Beard's version text.
-
-        commit_hash: hash that we're checking against
-        """
-
-        self._num_commits_behind = 0
-        self._newest_commit_hash = None
-
-        gh = github.GitHub(self.github_repo_user, self.github_repo, self.branch)
-
-        # find newest commit
-        for curCommit in gh.commits():
-            if not self._newest_commit_hash:
-                self._newest_commit_hash = curCommit['sha']
-                if not self._cur_commit_hash:
-                    break
-
-            if curCommit['sha'] == self._cur_commit_hash:
-                break
-
-            self._num_commits_behind += 1
-
-        logger.log(u"newest: " + str(self._newest_commit_hash) + " and current: " + str(self._cur_commit_hash) + " and num_commits: " + str(self._num_commits_behind), logger.DEBUG)
+
+        self._find_installed_version()
+
+        try:
+            self._check_github_for_update()
+        except Exception, e:
+            logger.log(u"Unable to contact github, can't check for update: " + repr(e), logger.ERROR)
+            return False
+
+        if not self._cur_commit_hash or self._num_commits_behind > 0:
+            return True
+
+        return False
+
+    def _check_github_for_update(self):
+        """
+        Uses pygithub to ask github if there is a newer version that the provided
+        commit hash. If there is a newer version it sets Sick Beard's version text.
+
+        commit_hash: hash that we're checking against
+        """
+
+        self._num_commits_behind = 0
+        self._newest_commit_hash = None
+
+        gh = github.GitHub(self.github_repo_user, self.github_repo, self.branch)
+
+        # try to get newest commit hash and commits behind directly by comparing branch and current commit
+        if self._cur_commit_hash:
+            branch_compared = gh.compare(base=self.branch, head=self._cur_commit_hash)
+
+            if 'base_commit' in branch_compared:
+                self._newest_commit_hash = branch_compared['base_commit']['sha']
+
+            if 'behind_by' in branch_compared:
+                self._num_commits_behind = int(branch_compared['behind_by'])
+
+        # fall back and iterate over last 100 (items per page in gh_api) commits
+        if not self._newest_commit_hash:
+
+            for curCommit in gh.commits():
+                if not self._newest_commit_hash:
+                    self._newest_commit_hash = curCommit['sha']
+                    if not self._cur_commit_hash:
+                        break
+
+                if curCommit['sha'] == self._cur_commit_hash:
+                    break
+
+                # when _cur_commit_hash doesn't match anything _num_commits_behind == 100
+                self._num_commits_behind += 1
+
+        logger.log(u"cur_commit = " + str(self._cur_commit_hash) + u", newest_commit = " + str(self._newest_commit_hash)
+                   + u", num_commits_behind = " + str(self._num_commits_behind), logger.DEBUG)
 
     def set_newest_text(self):
 
-        # if we're up to date then don't set this
-        sickbeard.NEWEST_VERSION_STRING = None
-
-        if not self._cur_commit_hash or self._num_commits_behind == 100:
-            logger.log(u"Unknown current version, don't know if we should update or not", logger.DEBUG)
-
-            newest_text = "Unknown version: If you've never used the Sick Beard upgrade system then I don't know what version you have."
-            newest_text += "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
-
-        elif self._num_commits_behind > 0:
-                base_url = 'http://github.com/' + self.github_repo_user + '/' + self.github_repo
-                if self._newest_commit_hash:
-                    url = base_url + '/compare/' + self._cur_commit_hash + '...' + self._newest_commit_hash
-                else:
-                    url = base_url + '/commits/'
-
-                newest_text = 'There is a <a href="' + url + '" onclick="window.open(this.href); return false;">newer version available</a>'
-                newest_text += " (you're " + str(self._num_commits_behind) + " commit"
-                if self._num_commits_behind > 1:
-                    newest_text += "s"
-                newest_text += " behind)" + "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
-        else:
-            return
-
-        sickbeard.NEWEST_VERSION_STRING = newest_text
-
-    def update(self):
-        """
-        Downloads the latest source tarball from github and installs it over the existing version.
-        """
-        base_url = 'https://github.com/' + self.github_repo_user + '/' + self.github_repo
-        tar_download_url = base_url + '/tarball/' + self.branch
-        version_path = ek.ek(os.path.join, sickbeard.PROG_DIR, u'version.txt')
-
-        try:
-            # prepare the update dir
-            sb_update_dir = ek.ek(os.path.join, sickbeard.PROG_DIR, u'sb-update')
-
-            if os.path.isdir(sb_update_dir):
-                logger.log(u"Clearing out update folder " + sb_update_dir + " before extracting")
-                shutil.rmtree(sb_update_dir)
-
-            logger.log(u"Creating update folder " + sb_update_dir + " before extracting")
-            os.makedirs(sb_update_dir)
-
-            # retrieve file
-            logger.log(u"Downloading update from " + repr(tar_download_url))
-            tar_download_path = os.path.join(sb_update_dir, u'sb-update.tar')
-            urllib.urlretrieve(tar_download_url, tar_download_path)
-
-            if not ek.ek(os.path.isfile, tar_download_path):
-                logger.log(u"Unable to retrieve new version from " + tar_download_url + ", can't update", logger.ERROR)
-                return False
-
-            # extract to sb-update dir
-            logger.log(u"Extracting file " + tar_download_path)
-            tar = tarfile.open(tar_download_path)
-            tar.extractall(sb_update_dir)
-            tar.close()
-
-            # delete .tar.gz
-            logger.log(u"Deleting file " + tar_download_path)
-            os.remove(tar_download_path)
-
-            # find update dir name
-            update_dir_contents = [x for x in os.listdir(sb_update_dir) if os.path.isdir(os.path.join(sb_update_dir, x))]
-            if len(update_dir_contents) != 1:
-                logger.log(u"Invalid update data, update failed: " + str(update_dir_contents), logger.ERROR)
-                return False
-            content_dir = os.path.join(sb_update_dir, update_dir_contents[0])
-
-            # walk temp folder and move files to main folder
-            for dirname, dirnames, filenames in os.walk(content_dir):  # @UnusedVariable
-                dirname = dirname[len(content_dir) + 1:]
-                for curfile in filenames:
-                    old_path = os.path.join(content_dir, dirname, curfile)
-                    new_path = os.path.join(sickbeard.PROG_DIR, dirname, curfile)
-
-                    if os.path.isfile(new_path):
-                        os.remove(new_path)
-                    os.renames(old_path, new_path)
-
-            # update version.txt with commit hash
+        # if we're up to date then don't set this
+        sickbeard.NEWEST_VERSION_STRING = None
+
+        if not self._cur_commit_hash:
+            logger.log(u"Unknown current version number, don't know if we should update or not", logger.DEBUG)
+
+            newest_text = "Unknown current version number: If you've never used the Sick Beard upgrade system before then current version is not set."
+            newest_text += "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
+
+        elif self._num_commits_behind > 0:
+                base_url = 'http://github.com/' + self.github_repo_user + '/' + self.github_repo
+                if self._newest_commit_hash:
+                    url = base_url + '/compare/' + self._cur_commit_hash + '...' + self._newest_commit_hash
+                else:
+                    url = base_url + '/commits/'
+
+                newest_text = 'There is a <a href="' + url + '" onclick="window.open(this.href); return false;">newer version available</a>'
+                newest_text += " (you're " + str(self._num_commits_behind) + " commit"
+                if self._num_commits_behind > 1:
+                    newest_text += "s"
+                newest_text += " behind)" + "&mdash; <a href=\"" + self.get_update_url() + "\">Update Now</a>"
+        else:
+            return
+
+        sickbeard.NEWEST_VERSION_STRING = newest_text
+
+    def update(self):
+        """
+        Downloads the latest source tarball from github and installs it over the existing version.
+        """
+        base_url = 'https://github.com/' + self.github_repo_user + '/' + self.github_repo
+        tar_download_url = base_url + '/tarball/' + self.branch
+        version_path = ek.ek(os.path.join, sickbeard.PROG_DIR, u'version.txt')
+
+        try:
+            # prepare the update dir
+            sb_update_dir = ek.ek(os.path.join, sickbeard.PROG_DIR, u'sb-update')
+
+            if os.path.isdir(sb_update_dir):
+                logger.log(u"Clearing out update folder " + sb_update_dir + " before extracting")
+                shutil.rmtree(sb_update_dir)
+
+            logger.log(u"Creating update folder " + sb_update_dir + " before extracting")
+            os.makedirs(sb_update_dir)
+
+            # retrieve file
+            logger.log(u"Downloading update from " + repr(tar_download_url))
+            tar_download_path = os.path.join(sb_update_dir, u'sb-update.tar')
+            urllib.urlretrieve(tar_download_url, tar_download_path)
+
+            if not ek.ek(os.path.isfile, tar_download_path):
+                logger.log(u"Unable to retrieve new version from " + tar_download_url + ", can't update", logger.ERROR)
+                return False
+
+            if not ek.ek(tarfile.is_tarfile, tar_download_path):
+                logger.log(u"Retrieved version from " + tar_download_url + " is corrupt, can't update", logger.ERROR)
+                return False
+
+            # extract to sb-update dir
+            logger.log(u"Extracting file " + tar_download_path)
+            tar = tarfile.open(tar_download_path)
+            tar.extractall(sb_update_dir)
+            tar.close()
+
+            # delete .tar.gz
+            logger.log(u"Deleting file " + tar_download_path)
+            os.remove(tar_download_path)
+
+            # find update dir name
+            update_dir_contents = [x for x in os.listdir(sb_update_dir) if os.path.isdir(os.path.join(sb_update_dir, x))]
+            if len(update_dir_contents) != 1:
+                logger.log(u"Invalid update data, update failed: " + str(update_dir_contents), logger.ERROR)
+                return False
+            content_dir = os.path.join(sb_update_dir, update_dir_contents[0])
+
+            # walk temp folder and move files to main folder
+            logger.log(u"Moving files from " + content_dir + " to " + sickbeard.PROG_DIR)
+            for dirname, dirnames, filenames in os.walk(content_dir):  # @UnusedVariable
+                dirname = dirname[len(content_dir) + 1:]
+                for curfile in filenames:
+                    old_path = os.path.join(content_dir, dirname, curfile)
+                    new_path = os.path.join(sickbeard.PROG_DIR, dirname, curfile)
+
+                    if os.path.isfile(new_path):
+                        os.remove(new_path)
+                    os.renames(old_path, new_path)
+
+            # update version.txt with commit hash
             try:
-                with open(version_path, 'w') as ver_file:
-                    ver_file.write(self._newest_commit_hash)
-            except EnvironmentError, e:
-                logger.log(u"Unable to write version file, update not complete: " + ex(e), logger.ERROR)
-                return False
-
-        except Exception, e:
-            logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
-            return False
-
-        return True
+                with open(version_path, 'w') as ver_file:
+                    ver_file.write(self._newest_commit_hash)
+            except EnvironmentError, e:
+                logger.log(u"Unable to write version file, update not complete: " + ex(e), logger.ERROR)
+                return False
+
+        except Exception, e:
+            logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
+            return False
+
+        return True
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 77ab261db1..ef640944da 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -744,11 +744,6 @@ def saveSearch(self, use_nzbs=None, use_torrents=None, nzb_dir=None, sab_usernam
         # Episode Search
         sickbeard.DOWNLOAD_PROPERS = config.checkbox_to_value(download_propers)
 
-        if sickbeard.DOWNLOAD_PROPERS:
-            sickbeard.properFinderScheduler.silent = False
-        else:
-            sickbeard.properFinderScheduler.silent = True
-
         config.change_SEARCH_FREQUENCY(search_frequency)
         sickbeard.USENET_RETENTION = config.to_int(usenet_retention, default=500)
 
@@ -1089,27 +1084,30 @@ def index(self):
         return _munge(t)
 
     @cherrypy.expose
-    def saveNotifications(self, use_xbmc=None, xbmc_notify_onsnatch=None, xbmc_notify_ondownload=None, xbmc_update_onlyfirst=None,
-                          xbmc_update_library=None, xbmc_update_full=None, xbmc_host=None, xbmc_username=None, xbmc_password=None,
+    def saveNotifications(self,
+                          use_xbmc=None, xbmc_always_on=None, xbmc_notify_onsnatch=None, xbmc_notify_ondownload=None, xbmc_update_onlyfirst=None,
+                              xbmc_update_library=None, xbmc_update_full=None, xbmc_host=None, xbmc_username=None, xbmc_password=None,
                           use_plex=None, plex_notify_onsnatch=None, plex_notify_ondownload=None, plex_update_library=None,
-                          plex_server_host=None, plex_host=None, plex_username=None, plex_password=None,
+                              plex_server_host=None, plex_host=None, plex_username=None, plex_password=None,
                           use_growl=None, growl_notify_onsnatch=None, growl_notify_ondownload=None, growl_host=None, growl_password=None,
                           use_prowl=None, prowl_notify_onsnatch=None, prowl_notify_ondownload=None, prowl_api=None, prowl_priority=0,
                           use_twitter=None, twitter_notify_onsnatch=None, twitter_notify_ondownload=None,
                           use_boxcar=None, boxcar_notify_onsnatch=None, boxcar_notify_ondownload=None, boxcar_username=None,
                           use_pushover=None, pushover_notify_onsnatch=None, pushover_notify_ondownload=None, pushover_userkey=None,
                           use_libnotify=None, libnotify_notify_onsnatch=None, libnotify_notify_ondownload=None,
-                          use_nmj=None, nmj_host=None, nmj_database=None, nmj_mount=None, use_synoindex=None,
+                          use_nmj=None, nmj_host=None, nmj_database=None, nmj_mount=None,
+                          use_synoindex=None, synoindex_notify_onsnatch=None, synoindex_notify_ondownload=None, synoindex_update_library=None,
                           use_nmjv2=None, nmjv2_host=None, nmjv2_dbloc=None, nmjv2_database=None,
                           use_trakt=None, trakt_username=None, trakt_password=None, trakt_api=None,
                           use_pytivo=None, pytivo_notify_onsnatch=None, pytivo_notify_ondownload=None, pytivo_update_library=None,
-                          pytivo_host=None, pytivo_share_name=None, pytivo_tivo_name=None,
+                              pytivo_host=None, pytivo_share_name=None, pytivo_tivo_name=None,
                           use_nma=None, nma_notify_onsnatch=None, nma_notify_ondownload=None, nma_api=None, nma_priority=0):
 
         results = []
 
-        # Home Theater
+        # Home Theater / NAS
         sickbeard.USE_XBMC = config.checkbox_to_value(use_xbmc)
+        sickbeard.XBMC_ALWAYS_ON = config.checkbox_to_value(xbmc_always_on)
         sickbeard.XBMC_NOTIFY_ONSNATCH = config.checkbox_to_value(xbmc_notify_onsnatch)
         sickbeard.XBMC_NOTIFY_ONDOWNLOAD = config.checkbox_to_value(xbmc_notify_ondownload)
         sickbeard.XBMC_UPDATE_LIBRARY = config.checkbox_to_value(xbmc_update_library)
@@ -1139,6 +1137,9 @@ def saveNotifications(self, use_xbmc=None, xbmc_notify_onsnatch=None, xbmc_notif
         sickbeard.NMJv2_DBLOC = nmjv2_dbloc
 
         sickbeard.USE_SYNOINDEX = config.checkbox_to_value(use_synoindex)
+        sickbeard.SYNOINDEX_NOTIFY_ONSNATCH = config.checkbox_to_value(synoindex_notify_onsnatch)
+        sickbeard.SYNOINDEX_NOTIFY_ONDOWNLOAD = config.checkbox_to_value(synoindex_notify_ondownload)
+        sickbeard.SYNOINDEX_UPDATE_LIBRARY = config.checkbox_to_value(synoindex_update_library)
 
         sickbeard.USE_PYTIVO = config.checkbox_to_value(use_pytivo)
         # sickbeard.PYTIVO_NOTIFY_ONSNATCH = config.checkbox_to_value(pytivo_notify_onsnatch)
@@ -1919,7 +1920,7 @@ def testTwitter(self):
         if result:
             return "Tweet successful, check your twitter to make sure it worked"
         else:
-            return "Error sending tweet"
+            return "Error sending Tweet"
 
     @cherrypy.expose
     def testXBMC(self, host=None, username=None, password=None):
@@ -1971,9 +1972,9 @@ def testNMJ(self, host=None, database=None, mount=None):
         host = config.clean_host(host)
         result = notifiers.nmj_notifier.test_notify(urllib.unquote_plus(host), database, mount)
         if result:
-            return "Successfully started the scan update"
+            return "Successfully started the scan update for NMJ"
         else:
-            return "Test failed to start the scan update"
+            return "Failed to start the scan update for NMJ"
 
     @cherrypy.expose
     def settingsNMJ(self, host=None):
@@ -1993,9 +1994,9 @@ def testNMJv2(self, host=None):
         host = config.clean_host(host)
         result = notifiers.nmjv2_notifier.test_notify(urllib.unquote_plus(host))
         if result:
-            return "Test notice sent successfully to " + urllib.unquote_plus(host)
+            return "Successfully started the scan update for NMJv2"
         else:
-            return "Test notice failed to " + urllib.unquote_plus(host)
+            return "Failed to start the scan update for NMJv2"
 
     @cherrypy.expose
     def settingsNMJv2(self, host=None, dbloc=None, instance=None):
@@ -2004,9 +2005,9 @@ def settingsNMJv2(self, host=None, dbloc=None, instance=None):
         host = config.clean_host(host)
         result = notifiers.nmjv2_notifier.notify_settings(urllib.unquote_plus(host), dbloc, instance)
         if result:
-            return '{"message": "NMJ Database found at: %(host)s", "database": "%(database)s"}' % {"host": host, "database": sickbeard.NMJv2_DATABASE}
+            return '{"message": "NMJv2 Database found at: %(host)s", "database": "%(database)s"}' % {"host": host, "database": sickbeard.NMJv2_DATABASE}
         else:
-            return '{"message": "Unable to find NMJ Database at location: %(dbloc)s. Is the right location selected and PCH running?", "database": ""}' % {"dbloc": dbloc}
+            return '{"message": "Unable to find NMJv2 Database at location: %(dbloc)s. Is the right location selected and PCH running?", "database": ""}' % {"dbloc": dbloc}
 
     @cherrypy.expose
     def testTrakt(self, api=None, username=None, password=None):
@@ -2028,6 +2029,16 @@ def testNMA(self, nma_api=None, nma_priority=0):
         else:
             return "Test NMA notice failed"
 
+    @cherrypy.expose
+    def testSynoNotify(self):
+        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
+
+        result = notifiers.synoindex_notifier.test_notify()
+        if result:
+            return "Test Synology notice sent successfully"
+        else:
+            return "Test Synology notice failed"
+
     @cherrypy.expose
     def shutdown(self, pid=None):
 
@@ -2124,7 +2135,7 @@ def displayShow(self, show=None):
                 t.submenu.append({ 'title': 'Delete',               'path': 'home/deleteShow?show=%d' % showObj.tvdbid, 'confirm': True })
                 t.submenu.append({ 'title': 'Re-scan files',        'path': 'home/refreshShow?show=%d' % showObj.tvdbid })
                 t.submenu.append({ 'title': 'Force Full Update',    'path': 'home/updateShow?show=%d&amp;force=1' % showObj.tvdbid })
-                t.submenu.append({ 'title': 'Update show in XBMC',  'path': 'home/updateXBMC?showName=%s' % urllib.quote_plus(showObj.name.encode('utf-8')), 'requires': haveXBMC })
+                t.submenu.append({ 'title': 'Update show in XBMC',  'path': 'home/updateXBMC?show=%d' % showObj.tvdbid, 'requires': haveXBMC })
                 t.submenu.append({ 'title': 'Preview Rename',       'path': 'home/testRename?show=%d' % showObj.tvdbid })
 
         t.show = showObj
@@ -2342,14 +2353,19 @@ def updateShow(self, show=None, force=0):
         redirect("/home/displayShow?show=" + str(showObj.tvdbid))
 
     @cherrypy.expose
-    def updateXBMC(self, showName=None):
+    def updateXBMC(self, show=None):
         if sickbeard.XBMC_UPDATE_ONLYFIRST:
             # only send update to first host in the list -- workaround for xbmc sql backend users
             host = sickbeard.XBMC_HOST.split(",")[0].strip()
         else:
             host = sickbeard.XBMC_HOST
 
-        if notifiers.xbmc_notifier.update_library(showName=showName):
+        if show:
+            show_obj = sickbeard.helpers.findCertainShow(sickbeard.showList, int(show))
+        else:
+            show_obj = None
+
+        if notifiers.xbmc_notifier.update_library(show_obj=show_obj):
             ui.notifications.message("Library update command sent to XBMC host(s): " + host)
         else:
             ui.notifications.error("Unable to contact one or more XBMC host(s): " + host)
diff --git a/tests/common_tests.py b/tests/common_tests.py
index 2c298c0724..76cb7a1f8d 100644
--- a/tests/common_tests.py
+++ b/tests/common_tests.py
@@ -52,9 +52,12 @@ def test_RAWHDTV(self):
         self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test.Show.S01E02.1080i.HDTV.H.264.DD2.0-GROUP"))
         self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test Show - S01E02 - 1080i HDTV MPA1.0 H.264 - GROUP"))
         self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test.Show.S01E02.1080i.HDTV.DD.5.1.h264-GROUP"))
+        self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test.Show.S01E02.1080i.HDTV.MPEG2.DD5.1-GROUP"))
+        self.assertEqual(common.Quality.RAWHDTV, common.Quality.nameQuality("Test Show S01E02 1080p HDTV DD5.1 H.264-GROUP"))
 
     def test_FULLHDTV(self):
         self.assertEqual(common.Quality.FULLHDTV, common.Quality.nameQuality("Test.Show.S01E02.1080p.HDTV.x264-GROUP"))
+        self.assertEqual(common.Quality.FULLHDTV, common.Quality.nameQuality("Test.Show.S01E02.1080p.HDTV.DD5.1.x264-GROUP"))
 
     def test_HDWEBDL(self):
         self.assertEqual(common.Quality.HDWEBDL, common.Quality.nameQuality("Test.Show.S01E02.720p.WEB-DL-GROUP"))