Changed the infrastructure for how the claferArgs are set up
Merge branch 'develop' into i236
Merge pull request #22 from gsdlab/i236

I236