Merge branch 'master' into development

# Conflicts:
#	README.md

Author: CodeByZach

README.md

@@ -7,12 +7,12 @@ An automatic web page progress bar.
 ### [Demo](https://codebyzach.github.io/pace/)
 ### [Documentation](https://codebyzach.github.io/pace/docs/)
 
-Include [pace.js](https://raw.github.com/CodeByZach/pace/master/pace.min.js) and the
+Include [pace.js](https://cdn.jsdelivr.net/npm/pace-js@latest/pace.min.js) and the
 [theme](https://codebyzach.github.io/pace/) css of your choice on your page
 (as early as is possible), and you're done!
 
 Pace will automatically monitor your ajax requests, event loop lag, document
-ready state, and elements on your page to decide the progress.  On ajax navigation
+ready state, and elements on your page to decide the progress. On ajax navigation
 it will begin again!
 
 If you use AMD or Browserify, require pace.js and call `pace.start()` as early in the loading process as is possible.
@@ -50,7 +50,7 @@ paceOptions = {
 You can also put options on the script tag:
 
 ```html
-<script data-pace-options='{ "ajax": false }' src='pace.js'></script>
+<script data-pace-options='{ "ajax": false }' src="https://cdn.jsdelivr.net/npm/pace-js@latest/pace.min.js"></script>
 ```
 
 If you're using AMD or Browserify, you can pass your options to `start`:
@@ -67,7 +67,7 @@ Themes
 ------
 
 Pace includes a bunch of [themes](https://codebyzach.github.io/pace/)
-to get you started.  Just include the appropriate css file.  Send us a PR with
+to get you started. Just include the appropriate css file. Send us a PR with
 any interesting themes you create.
 
 If you have minor styling changes and don't want to extend theme css, you can add custom class names to
@@ -82,7 +82,7 @@ paceOptions = {
 Collectors
 ----------
 
-Collectors are the bits of code which gather progress information.  Pace includes four default collectors:
+Collectors are the bits of code which gather progress information. Pace includes four default collectors:
 
 - Ajax
 
@@ -113,17 +113,17 @@ paceOptions = {
 };
 ```
 
-Add your own classes to `paceOptions.extraSources` to add more sources.  Each source should either
+Add your own classes to `paceOptions.extraSources` to add more sources. Each source should either
 have a `.progress` property, or a `.elements` property which is a list of objects with
-`.progress` properties.  Pace will automatically handle all scaling to make the progress
+`.progress` properties. Pace will automatically handle all scaling to make the progress
 changes look smooth to the user.
 
 Elements
 --------
 
 Elements being rendered to the screen is one way for us to decide that the page has been
-rendered.  If you would like to use that source of information (not required at all),
-specify one or more selectors.  You can comma separate the selectors to propertly handle
+rendered. If you would like to use that source of information (not required at all),
+specify one or more selectors. You can comma separate the selectors to propertly handle
 error states, where the progress bar should disappear, but the element we are looking for
 may never appear:
 
@@ -135,23 +135,23 @@ paceOptions = {
 }
 ```
 
-Pace will consider the elements test successful when each selector matches something.  For
+Pace will consider the elements test successful when each selector matches something. For
 this example, when either `.timeline` or `.timeline-error` exist, and either `.user-profile`
 or `.profile-error` exist.
 
 Restart Rules
 -------------
 
 Most users want the progress bar to automatically restart when a pushState event occurs
-(generally means ajax navigation is occuring).  You can disable this:
+(generally means ajax navigation is occuring). You can disable this:
 
 ```javascript
 paceOptions = {
   restartOnPushState: false
 }
 ```
 
-You can also have pace restart on every ajax request which lasts longer than x ms.  You'll want to
+You can also have pace restart on every ajax request which lasts longer than x ms. You'll want to
 disable this if you make ajax requests the user doesn't need to know about, like precaching:
 
 ```javascript
@@ -162,16 +162,16 @@ paceOptions = {
 
 You can always trigger a restart manually by calling `Pace.restart()`
 
-See [the source](https://github.com/CodeByZach/pace/blob/master/pace.js) for a full list of all options.
+See [the source](https://github.com/CodeByZach/pace/blob/master/pace.js) for a full list of options.
 
 API
 ---
 
 Pace exposes the following methods:
 
-- `Pace.start`: Show the progress bar and start updating.  Called automatically if you don't use AMD or CommonJS.
+- `Pace.start`: Show the progress bar and start updating. Called automatically if you don't use AMD or CommonJS.
 
-- `Pace.restart`: Show the progress bar if it's hidden and start reporting the progress from scratch.  Called automatically
+- `Pace.restart`: Show the progress bar if it's hidden and start reporting the progress from scratch. Called automatically
 whenever `pushState` or `replaceState` is called by default.
 
 - `Pace.stop`: Hide the progress bar and stop updating it.
@@ -254,24 +254,25 @@ Support
 -------
 
 Pace is designed to support IE8+ (standards mode), FF 3.5+, Chrome, Safari 4+, Opera 10.5+, and all modern
-mobile browsers.  If you run into a compatibility issue, or can make a case for supporting something else,
+mobile browsers. If you run into a compatibility issue, or can make a case for supporting something else,
 please create an issue.
 
 Size
 ----
 
-pace.js is 4kb minified and gzipped.  The themes vary between 0.5 and 4kb.
+pace.js is 4kb minified and gzipped. The themes vary between 0.5 and 4kb.
 
 Issues
 ------
 
-We have obviously not tested this on every website.  If you run into an issue, or find a way the automatic
-detection could be better, please [create an Issue](https://github.com/CodeByZach/pace/issues/new).  If you can include a test case, that's even better.
+We have obviously not tested this on every website. If you run into an issue, or find a way the automatic
+detection could be better, please [create an Issue](https://github.com/CodeByZach/pace/issues/new). If you can include a test case, that's even better.
 
 Credits
 -------
 
 [HubSpot](http://dev.hubspot.com)
+[CodeByZach](https://github.com/CodeByZach)
 
 Javascript by [Zack Bloom](http://twitter.com/zackbloom)
 CSS by [Adam Schwartz](http://twitter.com/adamfschwartz)

pace-theme-default.css

@@ -1,5 +1,5 @@
 /*!
- * pace.js v1.2.1 | Default theme
+ * pace.js v1.2.3 | Default theme
  * https://github.com/CodeByZach/pace/
  * Licensed MIT © HubSpot, Inc.
  */

pace-theme-default.min.css

@@ -1,5 +1,5 @@
 /*!
- * pace.js v1.2.1 | Default theme
+ * pace.js v1.2.3 | Default theme
  * https://github.com/CodeByZach/pace/
  * Licensed MIT © HubSpot, Inc.
  */

package-lock.json

@@ -1,11 +1,15 @@
 {
-  "name": "pace",
+  "name": "pace-js",
   "version": "1.2.3",
   "description": "Automatically add a progress bar to your site.",
-  "homepage": "https://codebyzach.github.io/pace/",
-  "authors": [
-    "CodeByZach <[email protected]>",
-  ],
+  "main": "pace.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/CodeByZach/pace.git"
+  },
   "keywords": [
     "pace",
     "pace-js",
@@ -15,19 +19,10 @@
     "loading-indicator",
     "loading-animation"
   ],
+  "author": "CodeByZach <[email protected]>",
   "license": "MIT",
-  "main": "pace.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/CodeByZach/pace/"
+  "bugs": {
+    "url": "https://github.com/CodeByZach/pace/issues"
   },
-  "devDependencies": {
-    "grunt-contrib-coffee": "~0.7.0",
-    "coffee-script": "~1.6.3",
-    "grunt-contrib-uglify": "~0.2.4",
-    "grunt-cli": "~0.1.9",
-    "grunt": "~0.4.1",
-    "grunt-contrib-watch": "~0.5.3",
-    "color": "~0.4.4"
-  }
-}
+  "homepage": "https://github.com/CodeByZach/pace#readme"
+}