Initial checkin of amy's work
Merged in Sadaf email changes & update .gitignore