This reverts commit 8d3c00c7.

Sorry, but database order should be the default unless a user really wants it alphabetized. (We should also allow a .annotate file so users can set their own preferred options more easily.)

Conflicts:

	.gitignore
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake