Extract a new .command_for_file method
Don't use gsub where it isn't necessary
Merge branch 'master' into haskell

Conflicts:
	spec/run_spec.rb