Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Remove adapter we're not going to use
Merge pull request #6 from meghanlarson/master

Remove unused adapter