Revert "20130923"

This reverts commit 7f99530a6259237b575dda497d275ec5228a948d.

Conflicts:
	db/development.sqlite3
	log/development.log
	log/production.log
	tmp/pids/server.pid