Merge pull request #7 from uw-it-aca/develop

Merge Develop to QA