Merge pull request #1 from pgrinaway/new-driver

Driver fixes
Merge remote-tracking branch 'upstream/master'
this merge is to bring the fork in sync with the master repo
fixed some issues with variable naming
Merge pull request #75 from pgrinaway/master

Minor changes to systembuilder to correct errors. Still more tests to fix.