Jellybean next

Pulling in all of pawitp's changes (!). With over a thousand commits, this is really more for kicks.