Less beeping, vim?
Use .md mode even if file is .md.erb.
Split featurebranch into masterbranch and sprintbranch.