Merge branch 'master' into update

Conflicts:
	.hound.yml
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb