Let's switch to http://opensource.org/licenses/MIT (replace that stuff in here with the new MIT license and you're done) as discussed