Merge branch 'master' into remove_ee

src/common/services/Services.d.ts

@@ -4,14 +4,18 @@
  */
 
 import { IEvent } from 'common/EventEmitter';
+import { IBuffer, IBufferSet } from 'common/buffer/Types';
 
 export interface IBufferService {
   readonly cols: number;
   readonly rows: number;
+  readonly buffer: IBuffer;
+  readonly buffers: IBufferSet;
 
   // TODO: Move resize event here
 
   resize(cols: number, rows: number): void;
+  reset(): void;
 }
 
 export interface IOptionsService {