Upgrade dependencies
Upgrade test suite to capybara 2.0
Merge branch 'develop'