adding description & email_addr to User, PEP8
Merge git://github.com/fvalverd/bottle-cork

Conflicts:
	examples/simple_webapp.py
Minor change.