Cider enabled and loaded by default

quick to load, no need to seperatly load it. Added mappings
and removed conflicting binding by nilling them.
Better diff output
Ignoring untangled files in modules