Various fixes for undefined variables

$vb_batch_mode => $vs_batch_mode
$pn_locale_id no longer defined
$ps_source_info => $pa_source_info
Fix some white space
Fix missing variable row id $vn_row_id => $vn_row
Fix missing variable $ps_loan_name
Set correct parameters for caProcessRefineryRelated

Conflicts:
	app/helpers/importHelpers.php
Removing incorrect phpdoc and whitespace
Remove conflict files committed in error

I noticed these coming in on a recent pull and am assuming they were
committed in error.
Merge pull request #132 from kehh/importFixesForUpstream

Import fixes for upstream