Upgrade gems to rails4
Upgrade Thinking Sphinx
Upgrade cucumber
Can run and fail cucumber, rspec in rails 4.1
Fix a couple of specs
Update rake and paperclip gems
Add scrypt gem for authlogic
Pass specs
Fix many rails4 problems found in cukes
Remove spurious files
Remove debug code
Upgrade user passwords to scrypt as they login
Fix controller spec
Use Ruby 1.9 hash syntax instead of hashrockets
Merge branch 'rails4'

Conflicts:
	config/routes.rb
	spec/routing/archive_routing_spec.rb