Work from November 2012 hackathon
Merge remote-tracking branch 'upstream/master' into kelly
Merge branch 'kelly'