Merge pull request #20 from evought/evoughtWorking

Last Milestone 0.9 Issue
Merge branch 'master' of github.com:evought/VCard-Tools
Merge branch 'master' into vcardToolsRefactor
Changed CONTACT_PHONE_NUMBER to CONTACT_TEL for consistency with VCard spec and
carried through appropriately, editing sql, php, tests.