travis setup
Merge branch 'master' of github.com:wstrinz/dicot

* 'master' of github.com:wstrinz/dicot:
  update tests for fixed classifier, move setup/teardown to spec_helper
  use fixtures for server spec