(#8) - implement persistent map/reduce for query
Merge branch 'develop' of https://github.com/pixelpark/ppnet into develop

Conflicts:
	app/index.html