Now with even more Mongo
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/helper.py
	app/models.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
This gitpush is sponsored by the letter 'g'
Merge remote-tracking branch 'origin/master'
This gitpush is sponsored by the letter 'g'