Applied fix for [issue #129](https://github.com/jdevalk/wordpress-seo/issues/129)
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo into Bugfix-genesis

Conflicts:
	readme.txt
Merge pull request #130 from jrfnl/Bugfix-genesis

Bugfix genesis