Merge capybara matchers with centro production branch

@ronwsmith @fohara This is ready for your review.  Capybara query options FTW!