Add short forms for some flags#267

boomshroom wants to merge 2 commits intowalles:masterwalles/moor:masterfrom

boomshroom:short-flagsboomshroom/moar:short-flagsCopy head branch name to clipboard