Merge pull request #89 from eileenmcnaughton/6.x-4.4

CRM-13737 fix d6 code to facilite altered directory structure
CRM-13737 d6 drupal integration - add default to variable_get call
fix more pseudoconstants - gender & phone type