adjust default branch hint

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
use posix -L in favour of longopts

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
use positional arguments in favour of keyword arguments for backwards compatibility with older python

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
Merge branch 'issue/297' of git://github.com/asteven/cdist
++changes

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