Cleaning up how featured tutorials was done.

This is part of issue #689 and #615