cleanup
Merge branch 'master' of github.com:ehershey/pebbletweet

Conflicts:
	README.md