More driver cleanup/refactoring
Merge branch 'master' of github.com:DaMSL/K3-Driver