switch to rails 2.1.1
Merge branch 'master' of https://github.com/corwinstephen/CicLAvia