puppet mode, no disabled commands, php hook things
merge