Re-enables fci-mode after upstream fixes.
Switches back to upstream/master, after PRs were merged in.
Switches expand-region bindings to more convenient C-c {.|,}