Misc
Effort to stop using :q and :q!
Merge branch 'master' into zaalbar