Don't use localedir + small gettext cleanup
Merge pull request #59 from infirit/1.6

Don't use localedir + small gettext cleanup