So much changes it doesnt even make sense anymore
Better javascript autocomplete
Merge branch 'master' into elmo
Merge master into elmo