Removed duplicate function and duplicate hook-in
Added deprecated notice for 'removed' function
Update class-metabox.php

Fix documentation typo
Merge git://github.com/jdevalk/wordpress-seo into remove-duplicate-function

Conflicts:
	readme.txt
Merge branch 'remove-duplicate-function' of github.com:jrfnl/wordpress-seo into remove-duplicate-function
Merge remote-tracking branch 'jdevalk/master' into remove-duplicate-function

Conflicts:
	readme.txt
Manual merge of PR #552