Merge pull request #373 from joshuarobinson/master

Refactor Language methods from FileTools. to new Language.h