tell better errors to use sublime as editor
upgraded to capybara 2
update rails to 3.2.12
merge base