chore: fix bad chips merge and broken tests (#2207)

Author: jelbourn

src/lib/chips/chip-list.spec.ts

@@ -22,15 +22,17 @@ describe('MdChipList', () => {
     });
 
     TestBed.compileComponents();
+  }));
 
+  beforeEach(() => {
     fixture = TestBed.createComponent(StaticChipList);
     fixture.detectChanges();
 
     chipListDebugElement = fixture.debugElement.query(By.directive(MdChipList));
     chipListNativeElement = chipListDebugElement.nativeElement;
     chipListInstance = chipListDebugElement.componentInstance;
     testComponent = fixture.debugElement.componentInstance;
-  }));
+  });
 
   describe('basic behaviors', () => {
     it('adds the `md-chip-list` class', () => {

src/lib/chips/chip.ts

@@ -10,7 +10,7 @@ import {
 } from '@angular/core';
 
 import {MdFocusable} from '../core/a11y/list-key-manager';
-import {coerceBooleanProperty} from '../core/coersion/boolean-property';
+import {coerceBooleanProperty} from '../core/coercion/boolean-property';
 
 export interface MdChipEvent {
   chip: MdChip;