Fixed custom bee names, localized even more things.
Fixed localizeAndFormat, MIGHT have caused issues otherwise, not sure.
I want to kill someone right now.
Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin

Conflicts:
	api
Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin

Conflicts:
	api
Oops.
Finally fixed all the localization
Fixed indentation
Updated lang submodule
More indentation fixes.
Merge pull request #124 from Vexatos/master-fork

Finally fixed _all_ the localization.