Reformat and rephrase some of the osm mapping section
Add example of multiple filters
Merge branch 'master' of github.com:pramsey/GeoGit into pramsey-master

Conflicts:
	doc/manual/source/interaction/osm.rst