CRM-13760 - improve spec code and cleanup

----------------------------------------
* CRM-13760: "Geocoding failed. Message from Google: OVER_QUERY_LIMIT" should not be fatal
  http://issues.civicrm.org/jira/browse/CRM-13760
Merge pull request #1991 from dlobo/CRM-13760

CRM-13760 - improve spec code and cleanup