edit .gitignore
Merge branch 'master' into amida
telephone numbers were showing up as email addresses