CRM-12874

----------------------------------------
* CRM-12874: Move civicrm.settings.php.tpl so it isn't in the same place as Smarty templates
  http://issues.civicrm.org/jira/browse/CRM-12874
CRM-12874

----------------------------------------
* CRM-12874: Rename civicrm.settings.php.tpl so it uses a different suffix from Smarty templates
  http://issues.civicrm.org/jira/browse/CRM-12874
Merge pull request #44 from dlobo/CRM-12874

CRM-12874