vim: Set ruby tab width to 2
Merge branch 'planning' into planning-mac