Fixes to indentation and removed 'scar tissue' code
Merge branch 'master' of https://github.com/sanger/S2Mapper into batch_save_refactor

Conflicts:
	test/spec/s2_batch_resource_spec.js
Post merge updates
Merge pull request #47 from iain-peddie-tessella/batch_save_refactor

Fixes to indentation and removed 'scar tissue' code