Cleaned up python
Merge branch 'master' of https://github.com/ilikescience/workinginpublic

Conflicts:
	application.py
	names.db
	schema.sql