Merging changes to ubuntu branch.
Add eclim and incsearch settings.
Merge master changes.
Merge remote-tracking branch 'origin/ubuntu'

Conflicts:
	dotfiles/.vim/plugin/keymaps.vim