added .gitattributes to prevent line-break issues
extended .gitignore to reduce tracking of unwanted files of OSs and IDEs
extended ignores
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 branch 'duplicate-sitemaps'

Conflicts:
	readme.txt
Fix issue #492
Merge branch 'empty-post-id-auth-check'

Conflicts:
	readme.txt
Fix for issue #306
Merge branch 'error-object-as-term'

Conflicts:
	readme.txt
Fixed issue with page analysis not taking feature image into account when calculating results for post images seo
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo

Conflicts:
	readme.txt
Merge git://github.com/jdevalk/wordpress-seo into error-object-as-term

Conflicts:
	readme.txt
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 empty-post-id-auth-check

Conflicts:
	readme.txt
Merge branch 'master' of git://github.com/jdevalk/wordpress-seo

Conflicts:
	readme.txt
Removed duplicate function and duplicate hook-in