Merge pull request #317 from steventlamb/master

Fix bug in settings_local template