Added S3 storage for photos.
Moved project over to rails 3.1.1. Removed Typus and now need to add new
custom admin interface.
Tweaked footer, added config.
Merge ../template into 3.1_upgrade

Conflicts:
	.gitignore
	.rvmrc
	Gemfile
	Gemfile.lock
	README
	Rakefile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/admin/admin_users_controller.rb
	app/controllers/application_controller.rb
	app/models/admin_user.rb
	config.ru
	config/application.rb
	config/config.yml
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
Finished up admin interface. Tweaks to site stylesheets.
Moved SQLite3 gem to development group.
Removed dependence on mini_exiftool. We'll need to write a paperclip
processor that uses Imagemagick to get the appropriate details.
Moved photos stylesheets to asset pipeline.
Corrected button text on pages admin.
Found the right font!
Tweaks to about page CSS.
Upgrade Rails and add New Relic.
Update copyright year.
Update Rails version.
Add Heartbeat middleware (thanks to @olivernn)
Update Rails, fix S3 and update Fancybox.
Add retina logo.
Re-indent and remove redundant views.
Convert javascript to coffeescript.
Up overall font weight.