CRM-12274 - more cleanup

----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
  http://issues.civicrm.org/jira/browse/CRM-12274
Merge pull request #343 from dlobo/CRM-12274

CRM-12274 - more cleanup