Merge pull request #197 from mballance-sf/master

Correct parse error with named-mapped class parameters in type expression
Merge remote-tracking branch 'upstream/master'
Beginnings of a compilation-argument import wizard
More changes to the compilation-argument import wizard
Merge remote-tracking branch 'origin/master'
Initial version of the Compilation Arguments import wizard