merged in licensing changes (we'll have to undo this eventually)

Benjamin Mako Hill || Want to submit a patch?