Annotate.
Pin capybara
bundle update
Footer logos
Add hidden mac .DS_Store files to .gitignore
Avoid automatic alt generation
Show Cambridge-specific funder only on the camcycle subdomain
Change order of tabs as per #105
Show number of results in the tab (as per #105)
Slightly nicer text for search count result
Upgrade rails.
Add missing indexes to thread_views
Merge branch 'footerlogos' into staging
Merge branch 'searchtabs' into staging
Merge branch 'staging'
Update to rails 3.2.11
Add a failing test - users can't edit their account details.
Update the list of controllers for devise-related matter.

Devise invitable have changed the way that they override the registration process,
but in doing so have broken a few things for us. The update was in
https://github.com/scambra/devise_invitable/commit/8396f47a418f418eebc2f65517ec394c776ff907

Refs #159
Add additional devise controller that should be accessed via SSL.

See also f94d59e4fc95c6f8c23c6cf326010e1cab37dd2a

Fixes #159
Merge branch 'staging'