Rename app_config.yml to application.yml
Move capistrano upload config task
Error pages at last =)
Merge ../x0y0

Conflicts:
	.travis.yml
	README.rdoc
	app/mailers/user_mailer.rb
	test/mailers/user_mailer_test.rb