Move non-deprecated functions up out of the deprecated section
Small coding style & whitespace fixes
Add shortcode addition to changelog
Efficiency tweak
Quote style
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Mini-tweaks
Clean up the url query vars after use...

... so they won't be send in again through the hidden `_wp_http_referer` field

This should fix situations where for instance the Facebook apps were retrieved, then deleted and on the next settings page save suddenly added again.
Update changelog
`current_user_can()` was being called too early

Related issues #881, #565
Merge pull request #896 from jrfnl/Issue-812-revisited-Facebook-apps

Clean up the url query vars after use...
Merge pull request #897 from jrfnl/Mini-tweaks

Mini tweaks
Merge branch 'pr/898'

Conflicts:
	readme.txt
Updated .gitignore file
Bumped version to 1.5.2.5
Network activations can now enter their license in the network admin.
Add `%%parent_title%%` shortcode for title / description replacements. Fixes #121
Merge branch 'master' of https://github.com/Yoast/wordpress-seo
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Remove-breadcrumb-enable
Logical placement of the enable validation

-> This needs to stay or else the 'default' option in the switch would need to go. Better to leave this.
No need to double-run clean-up routines