Finish renaming and cleaning up exercises

The exercises should now roughly match the state they were in on
the old website.
Merge branch 'master' into gh-pages