Added country / timezone fields
removed contact_email from wlcg_endpoint;
Merge branch 'master' of git@github.com:opensciencegrid/oim.git