Merging changes to ubuntu branch.
Add eclim and incsearch settings.