a bunch of updates
Merge branch 'master' of https://github.com/alsocollective/ewings_rally