Starting reset test
Merge branch 'develop' of github.com:blitzagency/rich into develop

* 'develop' of github.com:blitzagency/rich:
  moving test to let firefox stop crying
  updating travis
  travis firefox
  testing firefox travis
  travis
  travis
  travis
  travis
  travis
  travis
  adding phantom
  travis
  more travis
  fixin typo
  bumping version
  testing travis
  setting up travis
  fixing bad break, should be a continue
fixes collection view