Local changes
Merge branch 'master' of https://github.com/trotzig/diffux

Conflicts:
	Gemfile
	Gemfile.lock
Config and gemfile changes.
Merge branch 'master' of github.com:metaltoad/diffux

Conflicts:
	Gemfile.lock