bugfix if both override and order is specified
Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist
++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>