Add capybara with phantomjs and the First Glorious Test
Merge remote-tracking branch 'upstream/master'