cleanup schema
Merge branch 'master' into queries

Conflicts:
	schema.sql
Schema cleanup
Merge pull request #18 from JonCooperWorks/queries

Queries