Merge pull request #23 from garza/summer_2013

Summer 2013
Update README.md
Update README.md
template generation bug when no phone or address associated with contact, fixed
updating contact names on null
Merge pull request #24 from garza/master

merging summer branch and closing