Merge remote-tracking branch 'refs/remotes/purcell/master'

Conflicts:
	.gitignore
	init-git.el
	init-ruby-mode.el