First commit
stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/app_config.yaml
	lib/batch_comparison.rb
	lib/config_settings.rb
	spec/compare_batch_spec.rb
fix problem with Rcompute not running