Keeping this up to date with latest on wordpress.org

Signed-off-by: Jake Bresnehan <jakebresnehan@gmail.com>