Merge pull request #755 from ohmanger/patch-1

Ignore local.xml as this contains database credentials.