Fix short option parsing in bin/glacier and make help more helpful
Merge branch 'kennu-develop' into develop

* kennu-develop:
  Fix short option parsing in bin/glacier and make help more helpful