Lower scheduling priority for resque.
font_awesome added
Merge branch 'master' into staging

Conflicts:
	Gemfile.lock
Better .ruby-version specification.
Merge branch 'staging' into oops