format help and sort parameters
Merge branch 'dev' of github.com:NemesisRE/dinner into dev