Merge branch 'master' into gh-pages

Author: ChaseFlorell

demo/index.htm

@@ -118,7 +118,7 @@ <h2>a simple client side profanity filter</h2>
     customSwears: ['ass'],
     filter: true,
     externalSwears: 'swearWords.json',
-    profaneText: function() {
+    profaneText: function(data) {
         $('#five')
             .css('color', 'blue');
             console.log(data);