update to ruby 2.1.2

Conflicts:
	Gemfile
default_scope accepts a lambda