Merge pull request #8 from stevotdo/jellybean

fix conflicting browser plugins