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

Don't use localedir + small gettext cleanup