Merge branch 'master' into John
still need to consolidate action functions

-Still need to consolidate action functions for buttons and checkboxes
-Some stuff that doesn't work yet is commented out
-Also, I've comment out everything in the update function that aren't
needed right now, because they were taking the place of messages. When
those messages are all hooked up, we'll still use some of this logic,
so keep it all there
Merge branch 'John'