Update: Merge builtin and ES6 (fixes #6)

Merges `builtin` and `es6`, also alphabetizes the list.