Update types (#290)

* Export WaitForFilter interface

* Update types

* Update type for listeners

* update listener types

* Add additional types to GeneralEventEmitter

eventemitter2.d.ts

@@ -45,7 +45,7 @@ export interface EventAndListener {
     (event: string | string[], ...values: any[]): void;
 }
 
-interface WaitForFilter { (...values: any[]): boolean }
+export interface WaitForFilter { (...values: any[]): boolean }
 
 export interface WaitForOptions {
     /**
@@ -90,14 +90,18 @@ export interface OnceOptions {
 }
 
 export interface ListenToOptions {
-    on?: { (event: event | eventNS, handler: Function): void },
-    off?: { (event: event | eventNS, handler: Function): void },
+    on?: { (event: event | eventNS, handler: ListenerFn): void },
+    off?: { (event: event | eventNS, handler: ListenerFn): void },
     reducers: Function | Object
 }
 
 export interface GeneralEventEmitter{
-    addEventListener: Function,
-    removeEventListener: Function
+    addEventListener(event: event, handler: ListenerFn): this,
+    removeEventListener(event: event, handler: ListenerFn): this,
+    addListener?(event: event, handler: ListenerFn): this,
+    removeListener?(event: event, handler: ListenerFn): this,
+    on?(event: event, handler: ListenerFn): this,
+    off?(event: event, handler: ListenerFn): this
 }
 
 export interface OnOptions {