Fix misaligned block in icicles
Don't override icicles commands if called by script
Redefine icicles init to use a complete macro pipeline
Set icicles settings on every invocation
Cleanup after cba384a