Merge remote-tracking branch 'public/master' into testServer

Conflicts:
	README.md

Author: tdumitrescu

CHANGELOG.md

@@ -1,20 +1,30 @@
-**2.4.0**
-- add `people.union()`
+**2.4.2** (23 Mar 2015)
+- remove (undocumented) `token` property override in `track()`
 
-**2.3.5**
+**2.4.1** (12 Mar 2015)
+- fix for minification issue in `track()` colliding `token` and `ad`
+
+**2.4.0** (10 Mar 2015)
+- add `people.union()` (thanks @mogstad)
+- remove refs to global RegExp object
+
+**2.3.6** (20 Feb 2015)
+- Bower support (thanks @dehau)
+
+**2.3.5** (18 Feb 2015)
 - notification caching fix
 
-**2.3.4**
+**2.3.4** (17 Feb 2015)
 - ensure notification-tracking on dismissal
 
-**2.3.3**
-- fix Control-click with `track_links()` on Windows/Linux ([https://github.com/mixpanel/mixpanel-js/issues/20](https://github.com/mixpanel/mixpanel-js/issues/20))
+**2.3.3** (17 Feb 2015)
+- fix Control-click with `track_links()` on Windows/Linux (thanks @pfhayes, [https://github.com/mixpanel/mixpanel-js/issues/20](https://github.com/mixpanel/mixpanel-js/issues/20))
 
-**2.3.2**
+**2.3.2** (9 Dec 2014)
 - add `resource_type` to notification-tracking
 
-**2.3.1**
+**2.3.1** (24 Nov 2014)
 - fix error when calling `identify()` with no `distinct_id`
 
-**2.3.0**
+**2.3.0** (13 Nov 2014)
 - web notifications support

README.md

@@ -43,3 +43,6 @@ If you originally installed Mixpanel via Bower at its previous home ([https://gi
 
 In the future we plan to automate the last step with a headless browser to streamline development (although
 Mixpanel production releases are tested against a large matrix of browsers and operating systems).
+
+## Thanks
+For patches and support: @dehau, @drubin, @mogstad, @pfhayes, @sandorfr

mixpanel-jslib-snippet.min.js

@@ -1,5 +1,5 @@
 /*
- * Mixpanel JS Library v2.4.0
+ * Mixpanel JS Library v2.4.2
  *
  * Copyright 2012, Mixpanel, Inc. All Rights Reserved
  * http://mixpanel.com/
@@ -79,7 +79,7 @@ Globals should be all caps
  */
     var HTTP_PROTOCOL = (("https:" == document.location.protocol) ? "https://" : "http://"),
 
-        LIB_VERSION = '2.4.0',
+        LIB_VERSION = '2.4.2',
         SNIPPET_VERSION = (mixpanel && mixpanel['__SV']) || 0,
 
         // http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/
@@ -2250,7 +2250,7 @@ Globals should be all caps
 
         // set defaults
         properties = properties || {};
-        properties['token'] = properties.token || this.get_config('token');
+        properties['token'] = this.get_config('token');
 
         // update cookie
         this['cookie'].update_search_keyword(document.referrer);