Added license.
Added sorting.
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
Added delete line from cursor entries.

Also re-ordered some stuff.
Merge branch 'master' into gh-pages