update rails to 3.2.15 and some dev gems
Merge pull request #554 from opf/feature/rails3_update_gems

update rails to 3.2.15 and some dev gems
fix i18n test
wrap some settings in time tests into with_settings blocks
Merge pull request #555 from opf/feature/rails3_update_gems

fix time format tests after rails update
new version; updated changelog
Merge remote-tracking branch 'origin/feature/rails3' into fix/timelines-api-migration

Conflicts:
	doc/CHANGELOG.md