bundle update travis-build for fixes to the firefox addon
Merge remote-tracking branch 'origin/master' into hh-replace-net-ssh

Conflicts:
	Gemfile.lock