Refactoring
Merge branch 'master' of https://github.com/WSDOT-GIS/Alpaca.git