updates with non relevant info
Merge branch 'master' of https://github.com/ushahidi/docs.ushahidi.com

Conflicts:
	_posts/0_intro/2014-07-20-index.md