Manual merge local and work branch.
Removed parentheses autocompletion and some other stuff.