daveg: updating rails to the latest version.
daveg: updating friendly_id to the latest.
Merge branch 'master' into production