use default parameters

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
use __block type to manage keys

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
whitespace--

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

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