Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Refactor-wpseo-replace-vars

Conflicts:
	inc/wpseo-functions.php
	readme.txt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Refactor-wpseo-replace-vars

Conflicts:
	inc/wpseo-functions.php - also moved new function to a more logical place
travis.yml changes so WP v3.8.3 is tested as well.
Remove spaces from Travis config.
travis config changes
Run composer to install phpunit 3.7.*
reset travis.yml changes
Merge pull request #1172 from jrfnl/Refactor-wpseo-replace-vars

Refactor of the wpseo_replace_vars function
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Tests-for-replace-vars

Conflicts:
	inc/wpseo-functions.php