Merged in changes from contiguity/revealer into the main revealer branch. This contains functionality for witch and revealer. (Note revealer functionality still needs some fixes)