Watching Miguel's PyCon2014 Talk ;)
Merge branch 'master' into mongo

Conflicts:
	app/__init__.py
	app/api/virus_total_apis.py
	settings.py
git push origin masterMerge branch 'mongo'