Cleaning up a bit.
Clean up server test manifest.
Merge branch 'master' into fixup

Conflicts:
	test/server/http_data_source_spec.js
	test/server/test.js
Merge pull request #7 from benastan/fixup

Cleaning up a bit.