Added email and phone tags

Made requested changes for Kathy
Merge pull request #241 from extremezoo/Everett's-branch(6/5/14)

Added email and phone tags