Clean up
working on company controller stuff
Merge remote-tracking branch 'upstream/master'

carson fixed the sparkgs stuff
gr8