friendlyName -> name
Fixed tests. Sorry
Merge branch 'master' of github.com:gitterHQ/services
Merge pull request #8 from trevorah/friendlyname-api-change

friendlyName -> name
events are now passed in as a map
Merge remote-tracking branch 'upstream/master' into events-api-change
Merge remote-tracking branch 'upstream/master' into events-api-change

Conflicts:
	README.md
Merge pull request #9 from trevorah/events-api-change

events are now passed in as a map
fix typo
Added coverage checking