update rails
Merge branch 'master' of github.com:walterdavis/cdn_control