Move shortcode function to functions file to make sure it is also available to posts which may be added to the site via ajax
Updated readme for fix
Fixed table name regression
Merge git://github.com/jdevalk/wordpress-seo into shortcode-in-ajax

Conflicts:
	readme.txt
Updated readme
Better fix description
Merge git://github.com/jdevalk/wordpress-seo into shortcode-in-ajax

Conflicts:
	readme.txt
Merge git://github.com/jdevalk/wordpress-seo into shortcode-in-ajax

Conflicts:
	readme.txt
Manual merge of PR #497