Added email field
Merge branch 'master' into kent-test

Conflicts:
	db-init.sql
Merge pull request #2 from kmblake/kent-test

Added email field