Spacing
Fix some errors in the tests
Code style
Change back to `get_post()`
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Move changelog for versions older than 6 months to the separate changelog.txt file
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Truncate-changelog
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Truncate-changelog
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Truncate-changelog
Added more server and php section to info being tracked

Also:
- Added db_charset to the site variables being monitored
- Moved the server/php specific variables out of the WPSEO specific section to the more generic section as independently of which plugin is using the tracking class, this info is interesting
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Tracking-additions
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Truncate-changelog
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Fix-errors-in-tests
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Truncate-changelog
Merge branch 'master' of git://github.com/Yoast/wordpress-seo into Tracking-additions

Conflicts:
	admin/class-tracking.php