Update Scalariform to be consistent with ADAM
Run Scalariform
Merge pull request #41 from hammerlab/scalariform-setting

Update Scalariform to be consistent with ADAM