Allow optional directory option for 'locale' in merge.py

[operatorjen]

Currently merge.py assumes 'locale' is in the root directory of a django project. I've been working on recent django projects where locale exists in a subdirectory. If we can default to the root level and allow an override option that would be awesome :)

[davedash]

I thought this was a setting?