Add Capybara 2 compatibility
Update to phantomjs 1.8
Merge remote-tracking branch 'brutuscat/master'