Add gist full example for users when they ask for help
Added override stemmer and keyword marker filters to analysis documentation
Added override stemmer and keyword marker filters to analysis documentation
Add String2Int Analysis plugin
Add OSDCFR Video (French content)
Update tutorials/_posts/2010-07-01-setting-up-elasticsearch.textile

Fix for download link. Was pointing to .com site for download which does not exist.
Merge pull request #323 from johnnypeck/patch-1

Fix broken link.
Merge pull request #322 from javanna/master

Add Solr river plugin mention.
Merge pull request #232 from dadoonet/help

Add more complete gist recreation example.
Fixed incorrect path for keyword marker and fixed link naming to stemmer override
Merge remote branch 'upstream/master'

Conflicts:
	_layouts/guide.html
	guide/reference/index-modules/analysis/keyword-marker-tokenfilter.textile
set example to be consistent with description
Merge pull request #320 from dadoonet/osdcfr2012

Add OSDCFR Video (French content)
Merge pull request #319 from dadoonet/patch-27

Add String2Int Analysis plugin
Rebrand user Assistly to Desk.com as it is now
Merge pull request #325 from mbbx6spp/rebrand-assistly-to-desk.com

[USERS] Rebrand user Assistly to Desk.com as we are known now
Home page grammar and readability fixes
Merge pull request #326 from KrisBraun/master

Home page copy.
Update guide/appendix/clients.textile

Added ElasticSearch WordPress plugin.
Merge pull request #327 from ferhatsb/master

ElasticSearch WordPress plugin