checking in before I break stuff
add more languages
Merge remote-tracking branch 'origin/master' into new-langs
Fixed integration issues