tell better errors to use sublime as editor
upgraded to capybara 2
Merge branch 'base'