Another small step on the way of enabling browser-based integration and acceptance testing. #51
Ignoring the BFA acceptance test for now as it's experiencing issues with timing when executed on SauceLabs.
Merge remote-tracking branch 'upstream/master'