Fixed %%page%% variable not being replaced when on pages

Issue #801
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-801-page-variable-for-pages

Conflicts:
	readme.txt
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-801-page-variable-for-pages
Change force rewrite to use `wp_head` hook instead of `get_header`, fixes #817
Make it work for a post types, cpt included
Merge pull request #805 from jrfnl/Issue-801-page-variable-for-pages

Fixed %%page%% variable not being replaced when on pages
`wp_head` is actually too late as the `<title>` may have already been echoed... A very late hook on `template_redirect` is a better solution. Related to #817.
Merge branch 'master' of https://github.com/Yoast/wordpress-seo
Added a dynamic filter function to allow the changing of frequencies of different URLs added to the sitemap. Props to @haroldkyle for the idea.
Make sure to noindex private posts.
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Issue-802-admin-bar-link

Conflicts:
	readme.txt