Gemfile: downgrade activesupport to 3.2.x

4.1.1 seems to have caused an issue where jobs on OS X got into an
infinite loop, erroring with an "invalid UTF-8" error when they
finished.
Merge branch 'master' into features/docker-cpusets

Conflicts:
	Gemfile.lock