Merge pull request #48 from materialsvirtuallab/master

Streamlining of qadapter code.