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
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
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
Merge pull request #305 from Minio/master

inc/class-rewrite.php - Resolve issue #304
Merge pull request #314 from mirkolofio/master

Fix the issue on missing/exceeding 'www.'
Merge pull request #344 from jrfnl/un-schedule-yoast-tracking

Properly do Yoast tracking cron job scheduling & (especially) unscheduling
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo
Merge pull request #370 from jrfnl/master

Fix _Invalid argument supplied for foreach()_ notice for WPML
no message