Fix terminal else clause on some conditionals

Fix some conditionals where elsif should be else.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Remove ActiveRecord requirement. No db here.

We're not using a database for this app, so stop requiring
ActiveRecord.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Remove .DS_Store files

Remove stray .DS_Store files

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Disable fixture loading in tests

Since we have no database, we have no fixtures, and thus we need to
comment out this line which loads fixtures -- otherwise "rake test"
fails.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Ignore public/assets dir

Ignore public/assets dir -- which we might have from running "rake
assets:precompile" in our working copy.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Upgrade to rails 3.2.13

Upgrade to rails 3.2.13

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Commit session_store initializer

Commit session_store initializer -- part of rails upgrade, missed?

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Specify ruby version 1.9.3

Specify ruby version 1.9.3 in Gemfile

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Update oj gem to 2.1.1

Update the oj gem to 2.1.1 in an attempt to resolve segfault and
related issues when deploying to Heroku.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
Merge branch 'master' into jeff_rails_upgrade_etc

Merging today's changes from master.