Update deps
Merge branch 'master' into ducktrap

Conflicts:
	Gemfile
	rom-mapper.gemspec