updates
Merge branch 'master' of github.com:DGaffney/ferguson_extraction