Merge branch 'master' into testing
started blacklist implementation
Vast updates with Spam, blacklists, and moderation
fixed error reporting
Switched badge colors
Added blog cacheing
Updated all comments page
Merging in new blacklisting, etc.
Merge branch 'master' into testing

Conflicts:
	db/dev.db
	models.rb
	views/admin.erb
reinstated db