Merge remote-tracking branch 'origin/master' into feature/storage

Conflicts:
	package.json

Author: frankebersoll

appveyor.yml

@@ -1,7 +1,7 @@
 version: 1.3.{build}
 
 install:
-  - ps: Install-Product node 4
+  - ps: Install-Product node 5
   - npm install -g tsd
   - npm install -g gulp
   - npm install -g bower

dist/exceptionless.d.ts

@@ -198,8 +198,11 @@ export declare class Configuration implements IConfigurationSettings {
     private _serverUrl;
     serverUrl: string;
     private _dataExclusions;
+    private _userAgentBotPatterns;
     dataExclusions: string[];
     addDataExclusions(...exclusions: string[]): void;
+    userAgentBotPatterns: string[];
+    addUserAgentBotPatterns(...userAgentBotPatterns: string[]): void;
     plugins: IEventPlugin[];
     addPlugin(plugin: IEventPlugin): void;
     addPlugin(name: string, priority: number, pluginAction: (context: EventPluginContext, next?: () => void) => void): void;
@@ -230,6 +233,8 @@ export declare class EventBuilder {
     setUserIdentity(userInfo: IUserInfo): EventBuilder;
     setUserIdentity(identity: string): EventBuilder;
     setUserIdentity(identity: string, name: string): EventBuilder;
+    setUserDescription(emailAddress: string, description: string): EventBuilder;
+    setManualStackingKey(manualStackingKey: string): EventBuilder;
     setValue(value: number): EventBuilder;
     addTags(...tags: string[]): EventBuilder;
     setProperty(name: string, value: any, maxDepth?: number, excludedPropertyNames?: string[]): EventBuilder;