Made the lightbox display none by default.  This should stop it from flashing.  Also merged both branches so we can push all changes to both.