Add support for standard pygame quit and "q" key

Also, do more clean up.