CRM-13694 - Check if CIVICRM_SETTINGS_PATH already defined
Merge pull request #28 from colemanw/4.4

CRM-13694 - Check if CIVICRM_SETTINGS_PATH already defined
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-55-24