inc/class-rewrite.php - Resolve issue #304

While creating rewrite rules, preppend category slug by it's
ancestors slugs only if $taxonomy['category']->rewrite['hierarchical']
is true. Until now, users who set it to false got 404 error code
instead of subcategory pages.
Fix the issue on missing/exceeding 'www.' in some host/wordpress configurations that falls in a 'Domains, protocols and ports must match' error
Removed the 'missing argument'- fix so this is a now a separate branch for the unscheduling
Added note on potential impact on other Yoast plugins
Merge branch 'master' into un-schedule-yoast-tracking

Conflicts:
	inc/wpseo-functions.php
	readme.txt
Merge had inadvertedly reverted some of the changes in master, added these back
Merge branch 'master' into un-schedule-yoast-tracking
i18n updates

* Updated ru_RU
* Updated .pot file
Adding proper .pot header back in
Fix _Invalid argument supplied for foreach()_ notice for WPML as reported by [pbearne](https://github.com/pbearne) in issue #369
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo
Upped the dev version version number to 1.4.20-beta
Fix typo
Rename options init method to be more auto-documenting
Bug fix: upgrade was only run on admin_init which could give issues with multi-site installations.

Rationale: If a multi-site install was upgraded, the options for each site would only be upgraded once an admin had logged into each site while - until that time - the old options would be used while the new ones would be expected.
Fix for upgrade being run before register_settings() being available
Added note about WooCommerce
Switch back to MailChimp.
Default to nofollowing links in RSS feed footers.
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo