update parser, add error checking
Merge branch 'master' of github.com:asmdss/parse_email

Conflicts:
	lib/lib.php