Linux changes.
Added conditional linux emacs client definition.
Merge branch 'master' of http://github.com/cbtlsl/vim

Conflicts:
	.vimrc
Removed merge line.