added .gitattributes to prevent line-break issues
extended .gitignore to reduce tracking of unwanted files of OSs and IDEs
extended ignores
Fixed issue with page analysis not taking feature image into account when calculating results for post images seo
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
Removed duplicate function and duplicate hook-in
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
Added deprecated notice for 'removed' function
Update class-metabox.php

Fix documentation typo
Merge git://github.com/jdevalk/wordpress-seo into error-object-as-term

Conflicts:
	readme.txt
Merge git://github.com/jdevalk/wordpress-seo into remove-duplicate-function

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

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
Merge remote-tracking branch 'jdevalk/master' into error-object-as-term

Conflicts:
	readme.txt
Merge remote-tracking branch 'jdevalk/master' into issue-576

Conflicts:
	readme.txt