friendlyName -> name
added travis config
Merge pull request #7 from trevorah/travis

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

friendlyName -> name
Merge remote-tracking branch 'upstream/master' into events-api-change
Merge remote-tracking branch 'upstream/master' into events-api-change

Conflicts:
	README.md