Merge demo policies from VMWorld2013

Needs to be reviewed and squashed, but should be fairly clean.  @zzamboni @nickanderson WDYT?