Windows host testing#14

znmeb wants to merge 2 commits intostaginghackoregon/transportation-systems-backend-2018:stagingfrom

windows-host-testinghackoregon/transportation-systems-backend-2018:windows-host-testingCopy head branch name to clipboard