osx periodic;
Merge branch 'master' of github.com:pdonelan/vimrc

Conflicts:
	home/.vimrc