Fixed test errors
Merge branch 'master' of https://github.com/zachgarwood/datatable

Conflicts:
	tests/DataTableTest.php