Upgrade Rails
Add new handlebars helpers for formatting date (using js strftime implementation), checking if date is in past, and truncating a string to a set number of words.
Merge branch 'master' into comments

Conflicts:
	Gemfile.lock
	app/assets/javascripts/handlebars_helpers.js