Gem updates.
Update uglifier to 2.1 series.
Merge remote branch 'origin/master' into coop

Conflicts:
	Gemfile
	Gemfile.lock