Merging flashCard's updates.

This is a fairly substantial merge. Haven't integrated flashCard into master in a month or so.