Merge remote-tracking branch 'upstream/master'

Conflicts:
	gitmessage
	rspec
	vimrc
	vimrc.bundles
	zlogin