Bug fixes to config / languages
Merge branch 'master' of github.com:JVMartin/angel