committing wip
fixed 'graph needs fixing'
Merge branch 'wip-graph-needs-fixing'

Conflicts:
	app.py
	data/db/local.0
	data/db/local.ns
	data/db/mongod.lock