use rails plugin instead of deprecated rails3
Merge remote-tracking branch 'github/master'

Conflicts:
	.zshrc
more changes