Squashed changes from the addghost branch into the master.

Squashed commit of the following:

commit b0f25311eb413830120b92598480d38c5eae0149
Author: marneborn <mikael@arneborn.net>
Date:   Wed Jun 18 13:11:19 2014 -0700

    Added the ghost shape and toggle button in the start menu
    It mostly works, but the ghost is drawn after the shape, so the shape
    sometimes disappears...