assorted cleanup, added sqlparse to requirements