Stuff.
Merge branch 'master' of https://github.com/iskandr/parakeet

Conflicts:
	config.py
Merge branch 'master' of https://github.com/iskandr/parakeet

Conflicts:
	adverb_api.py