Phantomjs added to package.json
Trying to fix travis-ci
Qunit force option added.
Running a headless server
Xvfb not needed since phantomjs is completely headless.
Test script path fixed in travis yml
testing
test2
Merge pull request #3 from lyndsysimon/travis

testing
Reset
Merge branch 'master' of https://github.com/CenterForOpenScience/HGrid

# By Steven Loria (6) and Alexander Ferguson (1)
# Via Alexander Ferguson (2) and others
* 'master' of https://github.com/CenterForOpenScience/HGrid:
  A few more regression tests
  Fix failing test
  Make it easier to run tests in browser
  Add mockjax for mocking requests/responses
  Update README
  Reorganize tests
  Added refresh hints to try and reduce expand/collapse filtering times

Conflicts:
	Gruntfile.js
	build/tests.js
	src/tests.js
Adding in general testing suite, destroy method for HGrid.
Merge branch 'master' of https://github.com/CenterForOpenScience/HGrid

# By Steven Loria
# Via Steven Loria (1) and jakerose27 (1)
* 'master' of https://github.com/CenterForOpenScience/HGrid:
  Build
  Update README with AJAX instructions
  Don't lazy-load by default
  Rename ajaxRoot -> ajaxSource
  Can customize how item urls are built with the itemUrl options
  getItemUrl and getItemsFromServer take an item instead of UID
  Test and refactor: implement addItemsFromServer
  If in async mode, collapse folders by default
  Clicking expand button fetches data
  Add getItemsFromServer and getItemUrl
  Add example
  Can load data asynchronously
  Set up mock responses for lazy loading tests

Conflicts:
	build/hgrid.js
	src/hgrid.js
	tests/test-hgrid.js