Cleaned things up to be more wordpress.org compliant and removed some extraneous junk.