update vimrc for nexus s morning pages environment
Merge branch 'vimfiles' of ssh://araxia.net/~/git/vimfiles into vimfiles

Conflicts:
	.vimrc