Merge master (squash)

Conflicts:
	.gitignore
	.travis.yml
	Gemfile
	Gemfile.lock
	gemfiles/Gemfile