Merge pull request #22 from wtsi-npg/devel

Mull changes from wtsi-devel
expended sample shhet generation and parsing
Merge branch 'devel' of github.com:mgcam/npg_tracking into devel
removed prototype samplesheet module; PBP
commented out lines removed from the test
don't bail out on finding no runfolders when FTP'ing to instrument for update info
Merge branch 'devel2' into devel
return to a reg expression with variables
Merge pull request #23 from dkj/mg8_samplesheetlims

return to a reg expression with variables
Merge branch 'devel' of github.com:wtsi-npg/npg_tracking into devel
Merge branch 'devel' into mg8_samplesheetlims
use URI escaping for samplesheet contents instead of squashing whitespace and flipping , for |
use URI escaping for samplesheet contents instead of squashing whitespace and flipping , for |
Remove space squashing
Merge branch 'mg8_samplesheetlims' into devel2

Remove whitespace squashing from test

Conflicts:
	Changes
Merge pull request #24 from dkj/mg8_samplesheetlims

use URI escaping for samplesheet contents ...
Merge branch 'devel' of github.com:mgcam/npg_tracking into devel
Merge branch 'mg8_samplesheetlims' into devel2
Merge branch 'mg8_samplesheetlims' into devel2