More merging with cmlenz github repo
More code cleanup
More BabelDjango -> django-babel