Update README.md
Update README.md
fixing conflicts
fixing conflicts
Merge branch 'master' of https://github.com/natebrennand/twilio-go
fix travis config to run on all go files
fix spelling errors
Merge branch 'master' into list-paging

Conflicts:
	.travis.yml
expanding README