Encourage more developers with vim modelines
Unless there's a plan to switch to using tabs for their intended purpose I propose that this vim modeline comment is added to the top or bottom of each file that uses hard 2-space indentation:
// vim: ts=2:sw=2:sts=2:et
That will make you more friends and still let you do things your own weird way