-Added 'city' to the list of parsed conference paper fields
Merge pull request #3 from Finalfantasykid/master

-Added 'city' to the list of parsed conference paper fields