3.0-vip

Additional cleanup from WordPress.com VIP Plugin Review.