Allow custom gettext alias for extract
Change feature to markerName, add unit test
Merge pull request #31 from xob/master

Allow custom gettext alias for extract
Merge remote-tracking branch 'origin/master' into tools

Conflicts:
	tasks/extract.js