Merged Google SVN r305

Merged in Google SVN r305 which includes a number of new language handlers
Also fixes a number of file encoding issues with existing files