Wordpress 4 update, again
Merge branch 'master' of https://github.com/appfog/af-php-wordpress