mini sprint fixes
Merge branch 'rails-31' of https://github.com/rkgordon3/radar into rails-31