vim: au FileType eruby
Merge remote-tracking branch 'origin/master'
-